Unverified Commit b83c196e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 98bba575 05c30cbd
Loading
Loading
Loading
Loading
+29 −14
Original line number Diff line number Diff line
@@ -855,21 +855,36 @@ class Machine:
        with self.nested(f"waiting for {regex} to appear on screen"):
            retry(screen_matches)

    def wait_for_console_text(self, regex: str) -> None:
        with self.nested(f"waiting for {regex} to appear on console"):
    def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None:
        """
            Wait for the provided regex to appear on console.
            For each reads,

            If timeout is None, timeout is infinite.

            `timeout` is in seconds.
        """
        # Buffer the console output, this is needed
        # to match multiline regexes.
        console = io.StringIO()
            while True:
        def console_matches() -> bool:
            nonlocal console
            try:
                    console.write(self.last_lines.get())
                # This will return as soon as possible and
                # sleep 1 second.
                console.write(self.last_lines.get(block=False))
            except queue.Empty:
                    self.sleep(1)
                    continue
                pass
            console.seek(0)
            matches = re.search(regex, console.read())
                if matches is not None:
                    return
            return (matches is not None)

        with self.nested(f"waiting for {regex} to appear on console"):
            if timeout is not None:
                retry(console_matches, timeout)
            else:
                while not console_matches():
                    pass

    def send_key(
        self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True
+1 −0
Original line number Diff line number Diff line
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
    license      = licenses.bsd3;
    platforms    = platforms.all;
    maintainers  = with maintainers; [ rnhmjoj ];
    mainProgram  = "monero-wallet-gui";
  };
}
+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ writeTextFile {
      directory.
    '';
    maintainers = with maintainers; [ qyliss tfc ];
    mainProgram = "drawio";
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@

mkDerivation rec {
  pname = "organicmaps";
  version = "2023.04.02-7";
  version = "2023.05.08-7";

  src = fetchFromGitHub {
    owner = "organicmaps";
    repo = "organicmaps";
    rev = "${version}-android";
    sha256 = "sha256-xXBzHo7IOo2f1raGnpFcsvs++crHMI5SACIc345cX7g=";
    sha256 = "sha256-V7qTi5NiZf+1voZSHfuAyfMeTeiYfs/CoOQ2zweKmaU=";
    fetchSubmodules = true;
  };

+1 −0
Original line number Diff line number Diff line
@@ -47,5 +47,6 @@ python3Packages.buildPythonApplication rec {
    platforms = platforms.linux;
    maintainers = with maintainers; [ symphorien ];
    license = licenses.gpl3Plus;
    changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}";
  };
}
Loading