canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+463132@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:add-data-dir-option-to-browse-test into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/463132
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:add-data-dir-option-to-browse-test into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/browse-test.py b/charms/focal/autopkgtest-web/webcontrol/browse-test.py
index 30bbca2..343a5a8 100755
--- a/charms/focal/autopkgtest-web/webcontrol/browse-test.py
+++ b/charms/focal/autopkgtest-web/webcontrol/browse-test.py
@@ -39,37 +39,50 @@ def parse_args():
         dest="queue",
         type=str,
     )
+    parser.add_argument(
+        "--data-dir",
+        dest="data_dir",
+        type=str,
+    )
 
     return parser.parse_args()
 
 
 if __name__ == "__main__":
     args = parse_args()
-    if args.database:
+    if args.data_dir:
+        browse.AMQP_QUEUE_CACHE = Path(args.data_dir + "/queued.json")
+        browse.RUNNING_CACHE = Path(args.data_dir + "/running.json")
         browse.db_con = utils.init_db(
-            args.database,
+            args.data_dir + "/autopkgtest.db",
             check_same_thread=False,
         )
     else:
-        browse.db_con = utils.init_db(
-            ":memory:",
-            check_same_thread=False,
-        )
-        with browse.db_con:
-            tests.populate_dummy_db(browse.db_con)
-
-    if args.queue:
-        browse.AMQP_QUEUE_CACHE = Path(args.queue)
-    else:
-        browse.AMQP_QUEUE_CACHE = Path("/dev/shm/queue.json")
-        tests.populate_dummy_amqp_cache(browse.AMQP_QUEUE_CACHE)
+        if args.database:
+            browse.db_con = utils.init_db(
+                args.database,
+                check_same_thread=False,
+            )
+        else:
+            browse.db_con = utils.init_db(
+                ":memory:",
+                check_same_thread=False,
+            )
+            with browse.db_con:
+                tests.populate_dummy_db(browse.db_con)
 
-    if args.running:
-        browse.RUNNING_CACHE = Path(args.running)
-    else:
-        browse.RUNNING_CACHE = Path("/dev/shm/running.json")
-        tests.populate_dummy_running_cache(browse.RUNNING_CACHE)
+        if args.queue:
+            browse.AMQP_QUEUE_CACHE = Path(args.queue)
+        else:
+            browse.AMQP_QUEUE_CACHE = Path("/dev/shm/queue.json")
+            tests.populate_dummy_amqp_cache(browse.AMQP_QUEUE_CACHE)
 
+        if args.running:
+            browse.RUNNING_CACHE = Path(args.running)
+        else:
+            browse.RUNNING_CACHE = Path("/dev/shm/running.json")
+            tests.populate_dummy_running_cache(browse.RUNNING_CACHE)
+        
     browse.swift_container_url = "swift-%s"
 
     if activate_debugtoolbar: