Merge pull request #284 from dmgav/add-username-to-tempdir

Add username to temporary directory name (used in demo mode with IPython kernel)

bluesky_queueserver/manager/config.py

@@ -5,6 +5,7 @@
 """
 import builtins
 import copy
+import getpass
 import logging
 import os
 import sys
@@ -683,7 +684,7 @@ def _get_startup_options(self):
             # If no location of startup code was specified, then load the default
             #   simulated ipython_sim/profile_collection_sim
             if not any([startup_script, startup_module, startup_profile, ipython_dir]):
-                ipython_dir = os.path.join(tempfile.gettempdir(), "qserver", "ipython")
+                ipython_dir = os.path.join(tempfile.gettempdir(), f"qserver_{getpass.getuser()}", "ipython")
                 startup_profile = default_startup_profile
                 demo_mode = True
 

bluesky_queueserver/manager/tests/test_start_re_manager_cli.py

@@ -1,4 +1,5 @@
 import copy
+import getpass
 import os
 import pprint
 import re
@@ -451,12 +452,13 @@ def test_cli_parameters_zmq_server_address_1(monkeypatch, re_manager_cmd, test_m
 
 def _get_expected_settings_default_1(tmpdir):
     use_ip_kernel = use_ipykernel_for_tests()
+    username = getpass.getuser()
     if use_ip_kernel:
         startup_dir = None
-        ipython_dir = "/tmp/qserver/ipython"
+        ipython_dir = f"/tmp/qserver_{username}/ipython"
         startup_profile = "collection_sim"
-        user_group_permissions_path = "/tmp/qserver/ipython/profile_collection_sim/startup"
-        existing_plans_and_devices_path = "/tmp/qserver/ipython/profile_collection_sim/startup"
+        user_group_permissions_path = f"/tmp/qserver_{username}/ipython/profile_collection_sim/startup"
+        existing_plans_and_devices_path = f"/tmp/qserver_{username}/ipython/profile_collection_sim/startup"
     else:
         startup_dir = "/bluesky_queueserver/profile_collection_sim/"
         ipython_dir = None