Added multi-node queue and fixed some styling issues

Author: hategan

tests/conftest.py

@@ -55,7 +55,7 @@ def pytest_addoption(parser):
                      help='Maximum age, in hours, of tests to keep saved.')
     parser.addoption('--id', action='store', default='hostname',
                      help='An identifier for this site to attach to tests when aggregated.')
-    parser.addoption('--server-url', action='store', default='https://testing.exaworks.org',
+    parser.addoption('--server-url', action='store', default='https://testing.psij.io',
                      help='The base URL of the test aggregation server.')
     parser.addoption('--key', action='store', default='random',
                      help='A secret to use when communicating to the aggregation server.')
@@ -67,6 +67,8 @@ def pytest_addoption(parser):
                      help='Pretend that the current git branch is this value.')
     parser.addoption('--queue-name', action='store', default=None,
                      help='A queue to run the batch jobs in.')
+    parser.addoption('--multi-node-queue-name', action='store', default=None,
+                     help='An optional queue to run multi-node batch jobs in.')
     parser.addoption('--project-name', action='store', default=None,
                      help='A project/account name to associate the batch jobs with.')
     parser.addoption('--account', action='store', default=None,
@@ -176,6 +178,7 @@ def pytest_generate_tests(metafunc):
         etps = []
         for x in _get_executors((metafunc.config)):
             etp = ExecutorTestParams(x, queue_name=options.queue_name,
+                                     multi_node_queue_name=options.multi_node_queue_name,
                                      account=_get_account(options),
                                      custom_attributes_raw=options.custom_attributes)
             etps.append(etp)

tests/installer/panels/batch_scheduler_panel.py

@@ -238,33 +238,39 @@ def _build_widgets(self) -> Widget:
                          ('PBS', 'pbs'), ('LSF', 'lsf'), ('Cobalt', 'cobalt')],
                         id='batch-selector',
                         allow_blank=False),
-                    classes='form-col-3 form-row'
+                    classes='bs-col-1 form-row', id='batch-selector-col'
                 ),
+                Vertical(
+                    Label('Account/project:', classes='form-label'),
+                    Input(id='account-input'),
+                    classes='bs-col-2 form-row batch-valid'
+                ),
+                classes='w-100 form-row', id='batch-system-group-1'
+            ),
+            Horizontal(
                 Vertical(
                     Label('Queue:', classes='form-label'),
                     Input(id='queue-input'),
-                    classes='form-col-3 form-row batch-valid'
+                    classes='bs-col-1 form-row batch-valid'
                 ),
                 Vertical(
-                    Label('Account/project:', classes='form-label'),
-                    Input(id='account-input'),
-                    classes='form-col-3 form-row batch-valid'
+                    Label('Multi-node queue:', classes='form-label'),
+                    Input(id='mqueue-input'),
+                    classes='bs-col-2 form-row batch-valid'
                 ),
-                classes='w-100 form-row', id='batch-system-group'
+                Checkbox('Run [b bright_yellow]t[/b bright_yellow]est job',
+                         id='cb-run-test-job', classes='bs-col-3 m-t-1 batch-valid'),
+                classes='w-100 form-row', id='batch-system-group-2'
             ),
             Horizontal(
                 Vertical(
                     Label('Custom attributes:', classes='form-label'),
-                    TextArea('', id='custom-attrs', read_only=True, soft_wrap=False),
-                    id='attr-cell',
-                    classes='form-col-2 h-auto'
+                    ShortcutButton('&Edit attrs.', id='btn-edit-attrs'),
+                    classes='bs-col-1 h-auto'
                 ),
                 Vertical(
-                    Label('', classes='form-label'),
-                    ShortcutButton('&Edit attributes', id='btn-edit-attrs'),
-                    Checkbox('Run [b bright_yellow]t[/b bright_yellow]est job',
-                             id='cb-run-test-job', classes='m-t-1'),
-                    classes='form-col-2 h-auto'
+                    TextArea('', id='custom-attrs', read_only=True, soft_wrap=False),
+                    classes='bs-col-23 h-auto'
                 ),
                 classes='w-100 h-auto batch-valid'
             ),
@@ -315,20 +321,28 @@ def batch_system_selected(self) -> None:
         if sched == 'local':
             self.app._focus_next()  # type: ignore
         else:
-            self.get_widget_by_id('queue-input').focus()
+            self.get_widget_by_id('account-input').focus()
 
     def set_scheduler(self, name: str) -> None:
         selector = self.get_widget_by_id('batch-selector')
         assert isinstance(selector, Select)
         selector.value = name
 
-    @on(Input.Submitted, '#queue-input')
-    def queue_submitted(self) -> None:
-        bottom = self.get_widget_by_id('account-input')
-        bottom.focus()
-
     @on(Input.Submitted, '#account-input')
     def account_submitted(self) -> None:
+        next = self.get_widget_by_id('queue-input')
+        next.focus()
+
+    @on(Input.Submitted, '#queue-input')
+    def queue_submitted(self, event: Input.Submitted) -> None:
+        next = self.get_widget_by_id('mqueue-input')
+        assert isinstance(next, Input)
+        if next.value == '':
+            next.value = event.input.value
+        next.focus()
+
+    @on(Input.Submitted, '#mqueue-input')
+    def mqueue_submitted(self) -> None:
         self.app._focus_next()  # type: ignore
 
     @on(Button.Pressed, '#btn-edit-attrs')
@@ -368,8 +382,7 @@ async def _run_test_job(self, jd: TestJobsDialog, job_no: int, label: str,
                             rspec: Optional[ResourceSpecV1], test_name: str) -> bool:
         try:
             jd.set_running(job_no)
-            await asyncio.sleep(2)
-
+            await asyncio.sleep(0.5)
             job = self._launch_job(test_name, rspec)
 
             await self._wait_for_queued_state(job)

tests/installer/panels/intro_panel.py

@@ -22,7 +22,7 @@ def _build_widgets(self) -> Widget:
 
     @property
     def label(self) -> str:
-        return 'Introduction'
+        return 'Welcome'
 
     @property
     def name(self) -> str:

tests/installer/panels/schedule_panel.py

@@ -71,7 +71,7 @@ def _build_widgets(self) -> Widget:
                 classes='h-auto m-b-1'
             ),
             Vertical(
-                Label('Preview', classes='form-label'),
+                Label('Preview:', classes='form-label'),
                 TextArea('-', id='method-preview', classes='', language='bash',
                          read_only=True, disabled=True),
                 classes='form-row h-auto'

tests/installer/style.tcss

@@ -157,7 +157,8 @@ ToggleButton .toggle--button {
 }
 
 App.no-unicode ToggleButton .toggle--button {
-    background: #000060;
+    color: black;
+    background: transparent;
 }
 
 ToggleButton.-on .toggle--button {
@@ -169,9 +170,8 @@ App.no-unicode ToggleButton.-on .toggle--button {
     color: #00ff00;
 }
 
-
 ToggleButton:focus .toggle--button {
-    background: #0040a0;
+    background: #606060;
 }
 
 ToggleButton.-on:focus .toggle--button {
@@ -276,7 +276,7 @@ LoadingIndicator {
 }
 
 App.small #sidebar {
-    min-width: 16;
+    min-width: 14;
     padding-left: 1;
     padding-top: 1;
 }
@@ -522,6 +522,10 @@ App.small .form-label {
     margin-bottom: 0;
 }
 
+#batch-selector-col {
+    min-width: 18;
+}
+
 #warn-no-batch {
     height: auto;
 }
@@ -530,12 +534,34 @@ App.small .form-label {
     padding-top: 2;
 }
 
+.bs-col-1 {
+    width: 36%;
+}
+
+.bs-col-2 {
+    width: 30%;
+}
+
+.bs-col-3 {
+    width: 34%;
+}
+
+.bs-col-23 {
+    width: 64%;
+}
+
 .form-col-3 {
     width: 33%;
     margin-right: 1;
     margin-bottom: 1;
 }
 
+.form-col-4 {
+    width: 25%;
+    margin-right: 0;
+    margin-bottom: 1;
+}
+
 .form-col-2 {
     width: 50%;
     margin-right: 2;
@@ -554,14 +580,20 @@ App.small .form-label {
     margin-right: 2;
 }
 
+#btn-edit-attrs {
+    margin-right: 1;
+    width: 100%;
+}
+
 #custom-attrs {
     background: #002040;
-    height: 7;
+    height: 5;
     overflow-x: auto;
     overflow-y: auto;
     padding: 0;
     border: none;
     color: #c0c0c0;
+    border-left: tall #002040;
 }
 
 .form-row {