diff --git a/services/tests/pixelfed-garage.nix b/services/tests/pixelfed-garage.nix index 0125a18d..97c49838 100644 --- a/services/tests/pixelfed-garage.nix +++ b/services/tests/pixelfed-garage.nix @@ -8,8 +8,8 @@ let email = "test@test.com"; password = "testtest"; - testImage = pkgs.copyPathToStore ./fediversity.png; - testImageColour = "#FF0500"; + testImage = pkgs.copyPathToStore ./green.png; + testImageColour = "#00FF00"; # FIXME: Replace all the By.XPATH by By.CSS_SELECTOR. @@ -59,6 +59,8 @@ let pkgs.writers.writePython3Bin "selenium-script-post-picture" { libraries = with pkgs.python3Packages; [ selenium ]; } '' + import time + ${seleniumImports} from selenium.webdriver.support.wait import WebDriverWait @@ -88,6 +90,11 @@ let lambda d: d.execute_script("return arguments[0].complete", img) ) + # FIXME: Sometimes, it takes some time for the picture to show on the + # screenshot, even after it has completed loaded. Not sure what a + # better test would be. + time.sleep(5) + ${seleniumTakeScreenshot "\"/home/selenium/screenshot.png\""} ${seleniumQuit}''; @@ -172,6 +179,7 @@ pkgs.nixosTest { { nodes, ... }: '' import re + import time server.start() @@ -199,6 +207,10 @@ pkgs.nixosTest { server.succeed("mc alias set garage ${nodes.server.fediversity.internal.garage.api.url} --api s3v4 --path off $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY") server.succeed("mc ls garage/pixelfed") + # FIXME: Need to find something more robust. We need to do this because + # Pixelfed always takes some time before sending things to Garage. + time.sleep(60) + with subtest("access image in garage"): image = server.succeed("mc find garage --regex '\\.png' --ignore '*_thumb.png'") image = image.rstrip()