Ben/win lin csv (#556)

* different flow for win and lin location selector

* typo

* fix input path

* attempt linux key path fix

* attempt linux key path fix

* fix linux

* fix chooser again

Author: ben-c-at-moz

choose_ci_set.py

@@ -93,8 +93,9 @@ def dedupe(run_list: list, slash: str) -> list:
         for j, entry_b in enumerate(run_list):
             if i == j:
                 continue
-            if entry_a in entry_b:
-                removes.append(j)
+            candidate = max((i, j))
+            if entry_a in entry_b and candidate not in removes:
+                removes.append(candidate)
 
     removes.sort(reverse=True)
     for remove in removes:
@@ -112,7 +113,7 @@ def dedupe(run_list: list, slash: str) -> list:
     if os.environ.get("TESTRAIL_REPORT"):
         # Run all tests if this is a scheduled beta
         with open(OUTPUT_FILE, "w") as fh:
-            print("tests")
+            fh.write("tests")
             sys.exit(0)
 
     slash = "/" if "/" in SCRIPT_DIR else "\\"

modules/page_object_generics.py

@@ -15,22 +15,41 @@ class GenericPage(BasePage):
 
     URL_TEMPLATE = "{url}"
 
-    def navigate_dialog_to_location(self, location: str) -> BasePage:
+    def navigate_dialog_to_location(
+        self, location: str, filename="test.txt"
+    ) -> BasePage:
         sleep(1.5)
         from pynput.keyboard import Controller, Key
 
         keyboard = Controller()
-        if self.sys_platform() == "Darwin" or self.sys_platform() == "Linux":
+        if self.sys_platform() == "Darwin":
             keyboard.type("/")
             sleep(1.5)
             keyboard.type(location.lstrip("/"))
-        else:
+            sleep(1)
+            keyboard.press(Key.enter)
+            sleep(1)
+            keyboard.press(Key.enter)
+        elif self.sys_platform().startswith("Win"):
+            keyboard.press(Key.ctrl)
+            keyboard.tap("l")
+            keyboard.release(Key.ctrl)
             sleep(1.5)
             keyboard.type(location)
-        sleep(1)
-        keyboard.press(Key.enter)
-        sleep(1)
-        keyboard.press(Key.enter)
+            sleep(1)
+            keyboard.tap(Key.enter)
+            sleep(1)
+            keyboard.press(Key.alt)
+            keyboard.tap("s")
+            keyboard.release(Key.alt)
+        else:
+            keyboard.press(Key.ctrl)
+            keyboard.tap("a")
+            keyboard.release(Key.ctrl)
+            sleep(1.5)
+            keyboard.type(f"{location}/{filename}")
+            sleep(1)
+            keyboard.tap(Key.enter)
 
 
 class GenericPdf(BasePage):

tests/password_manager/test_password_csv_correctness.py

@@ -7,6 +7,8 @@
 
 from modules.page_object import AboutLogins, GenericPage
 
+PASSWORDS_FILE = "passwords.csv"
+
 
 @pytest.fixture()
 def test_case():
@@ -36,10 +38,10 @@ def test_password_csv_correctness(
 
     # Export the password file
     time.sleep(3)
-    page.navigate_dialog_to_location(downloads_folder)
+    page.navigate_dialog_to_location(downloads_folder, PASSWORDS_FILE)
 
     # Verify the exported csv file is present in the target folder
-    csv_file = os.path.join(downloads_folder, "passwords.csv")
+    csv_file = os.path.join(downloads_folder, PASSWORDS_FILE)
     about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Verify the contents of the exported csv file

tests/password_manager/test_password_csv_export.py

@@ -6,6 +6,8 @@
 
 from modules.page_object import AboutLogins, GenericPage
 
+PASSWORDS_FILE = "passwords.csv"
+
 
 @pytest.fixture()
 def test_case():
@@ -36,7 +38,7 @@ def test_password_csv_export(
 
     # Export the password file
     time.sleep(3)
-    page.navigate_dialog_to_location(downloads_folder)
+    page.navigate_dialog_to_location(downloads_folder, PASSWORDS_FILE)
 
     keyboard.tap(Key.enter)