Updated runTests.sh to use new csw-services app (installed with cs).

tmtsoftware · Nov 6, 2020 · d8aca3d · d8aca3d
1 parent bde1497
commit d8aca3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docs/Event.html b/docs/Event.html
@@ -172,7 +172,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <dl>
 <dt id="csw.Event.Event"><code class="flex name class">
 <span>class <span class="ident">Event</span></span>
-<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675300, nanos=705390930), eventId: str = 'ee775a25-fd33-47ee-9d30-4bc9f07a35cc')</span>
+<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675839, nanos=348196983), eventId: str = '36e6a798-d9e1-4878-9d2e-f1fb479e8dc6')</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Abstract base class that creates an Event that can be published to the event service
@@ -414,7 +414,7 @@ <h2 id="args">Args</h2>
 </dd>
 <dt id="csw.Event.ObserveEvent"><code class="flex name class">
 <span>class <span class="ident">ObserveEvent</span></span>
-<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675300, nanos=705390930), eventId: str = 'ee775a25-fd33-47ee-9d30-4bc9f07a35cc')</span>
+<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675839, nanos=348196983), eventId: str = '36e6a798-d9e1-4878-9d2e-f1fb479e8dc6')</span>
 </code></dt>
 <dd>
 <div class="desc"><p>An event type fired when an observation has taken place.</p>
@@ -491,7 +491,7 @@ <h3>Inherited members</h3>
 </dd>
 <dt id="csw.Event.SystemEvent"><code class="flex name class">
 <span>class <span class="ident">SystemEvent</span></span>
-<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675300, nanos=705390930), eventId: str = 'ee775a25-fd33-47ee-9d30-4bc9f07a35cc')</span>
+<span>(</span><span>source: str, eventName: str, paramSet: List[<a title="csw.Parameter.Parameter" href="Parameter.html#csw.Parameter.Parameter">Parameter</a>], eventTime: <a title="csw.EventTime.EventTime" href="EventTime.html#csw.EventTime.EventTime">EventTime</a> = EventTime(seconds=1604675839, nanos=348196983), eventId: str = '36e6a798-d9e1-4878-9d2e-f1fb479e8dc6')</span>
 </code></dt>
 <dd>
 <div class="desc"><p>An event type for publishing changes in system data.</p>

diff --git a/tests/runTests.sh b/tests/runTests.sh
@@ -18,6 +18,7 @@ fi
 
 set -v
 csw-services start -e > $logfile 2>&1 &
+cswServicesPid=$!
 cd testSupport || exit 1
 sbt clean stage  >> $logfile 2>&1
 test-deploy/target/universal/stage/bin/test-container-cmd-app --local test-deploy/src/main/resources/TestContainer.conf   >> $logfile 2>&1 &
@@ -28,4 +29,6 @@ sleep 10
 # Run the python tests
 pytest --capture=tee-sys
 kill $assemblyPid
-csw-services.sh stop  >> $logfile 2>&1
+#csw-services stop  >> $logfile 2>&1
+kill $cswServicesPid
+