Merge branch 'master' into 4227-date-display

Conflicts:
	apps/workbench/test/integration/projects_test.rb

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index a6e8ec4101089f75e4ee89853da29b59ed00e6c3..7f10e45a762f58d270a079f339e793a1517b52cc 100644 (file)
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -549,7 +549,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
   [
     ['project with 10 pipelines', 10, 0],
-    ['project with 2 pipelines and 200 jobs', 2, 200],
+#    ['project with 200 jobs and 10 pipelines', 2, 200],
     ['project with 25 pipelines', 25, 0],
   ].each do |project_name, num_pipelines, num_jobs|
     test "scroll pipeline instances tab for #{project_name} with #{num_pipelines} pipelines and #{num_jobs} jobs" do

diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 728f1a437401798759f184327bec4684649966c8..0cfdfa88ee168186b11958d92742098cf7dba6c6 100644 (file)
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -192,7 +192,7 @@ func DoMemoryStats(cgroup Cgroup) {
        defer c.Close()
        b := bufio.NewScanner(c)
        thisSample := MemSample{time.Now(), make(map[string]int64)}
-       wantStats := [...]string{"cache", "pgmajfault", "rss"}
+       wantStats := [...]string{"cache", "swap", "pgmajfault", "rss"}
        for b.Scan() {
                var stat string
                var val int64

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index a9ebf424a8c5b17ad55e195204e399e0a2c38ae6..eb625be5ad917285f0ef3ca36014619838ab79cc 100644 (file)
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -167,10 +167,10 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
     def test_booted_node_lifecycle(self):
         cloud_node = testutil.cloud_node_mock(6)
         setup = self.start_node_boot(cloud_node, id_num=6)
-        self.daemon.node_up(setup)
-        self.daemon.update_server_wishlist([])
         monitor = self.node_factory.start().proxy()
         monitor.cloud_node.get.return_value = cloud_node
+        self.daemon.node_up(setup)
+        self.daemon.update_server_wishlist([])
         self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
         self.assertTrue(self.node_shutdown.start.called,
                         "daemon did not shut down booted node on offer")