MuranoCLI 3.0.7 → 3.0.8

data/spec/cmd_password_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano password', :cmd do

data/spec/cmd_setting_application_spec.rb

@@ -1,14 +1,13 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'json'
 require 'open3'
-require 'pathname'
 require 'vine'
 require 'cmd_common'
 

data/spec/cmd_setting_product_spec.rb

@@ -1,14 +1,13 @@
-# Last Modified: 2017.09.13 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'json'
 require 'open3'
-require 'pathname'
 require 'vine'
 require 'cmd_common'
 

data/spec/cmd_status_spec.rb

@@ -1,15 +1,14 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'json'
 require 'open3'
 require 'os'
-require 'pathname'
 require 'rbconfig'
 
 require 'cmd_common'
@@ -19,37 +18,34 @@ RSpec.describe 'murano status', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('statusTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'product', 'create', @product_name, '--save')
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
     @applctn_name = rname('statusTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'application', 'create', @applctn_name, '--save')
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
-    #out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
-    #olines = out.lines
-    #expect(olines[0]).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
-    #expect(olines[1]).to eq("Created default event handler\n")
-    #expect(err).to eq('')
-    #expect(status.exitstatus).to eq(0)
-
     out, err, status = Open3.capture3(
-      #capcmd('murano', 'syncdown', '--eventhandlers', '--no-delete', '--no-update')
-      capcmd('murano', 'syncdown', '--eventhandlers', '--no-delete', '--no-create')
+      capcmd('murano', 'syncdown', '--services', '--no-delete', '--no-update')
     )
-    # E.g.,
-    #  "Adding item timer_timer\nAdding item tsdb_exportJob\nAdding item user_account\n"
+    # NOTE: 2017-12-14: (landonb): The new behavior is that MurCLI will treat
+    #   platform scripts that are simply empty strings as not being in conflict
+    #   if the script does not exist locally, in addition to the script existing
+    #   locally but also just being an empty string.
+    # Currently, on a fresh solution, only user_account has script contents.
+    #   You'll see timer_timer and tsdb_export also existing, but empty.
+    #   Search eventhandler.undeletable for more on this issue.
     olines = out.lines
-    # 2017-08-08: Because of eventhandler.undeletable, the boilerplate items
-    #   pre-exist, in a sense, and are therefore described as being updated,
-    #   not added.
-    (0..2).each do |ln|
-      #expect(olines[ln].to_s).to a_string_starting_with('Adding item ')
-      expect(olines[ln].to_s).to a_string_starting_with('Updating item ')
+    (0..0).each do |ln|
+      expect(olines[ln].to_s).to a_string_starting_with('Adding item ')
     end
 
     expect(err).to eq('')
@@ -57,12 +53,16 @@ RSpec.describe 'murano status', :cmd, :needs_password do
   end
 
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @applctn_name, '-y'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', @product_name, '-y')
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -74,7 +74,6 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua}),
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:7}),
-      # singleRoute only appears in some of the tests.
       a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua}),
       a_string_matching(%r{ \+ \w  .*files/js/script\.js}),
       a_string_matching(%r{ \+ \w  .*files/icon\.png}),
@@ -97,47 +96,15 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua}),
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
       a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:7}),
-      # singleRoute does not appear in old Solutionfile tests
-      # that don't specify it.
-      #a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua}),
-      a_string_matching(%r{ \+ \w  .*files/js/script\.js}),
       a_string_matching(%r{ \+ \w  .*files/icon\.png}),
       a_string_matching(%r{ \+ \w  .*files/index\.html}),
+      a_string_matching(%r{ \+ \w  .*files/js/script\.js}),
     )
   end
 
   def match_remote_boilerplate_v1_0_0_service(slice)
     expect(slice).to include(
-      #a_string_matching(%r{ - \w  device2_event}),
-      #a_string_matching(%r{ - \w  interface_addGatewayResource}),
-      #a_string_matching(%r{ - \w  interface_addIdentity}),
-      #a_string_matching(%r{ - \w  interface_clearContent}),
-      #a_string_matching(%r{ - \w  interface_deleteContent}),
-      #a_string_matching(%r{ - \w  interface_downloadContent}),
-      #a_string_matching(%r{ - \w  interface_getGatewayResource}),
-      #a_string_matching(%r{ - \w  interface_getGatewaySettings}),
-      #a_string_matching(%r{ - \w  interface_getIdentity}),
-      #a_string_matching(%r{ - \w  interface_getIdentityState}),
-      #a_string_matching(%r{ - \w  interface_infoContent}),
-      #a_string_matching(%r{ - \w  interface_listContent}),
-      #a_string_matching(%r{ - \w  interface_listIdentities}),
-      #a_string_matching(%r{ - \w  interface_makeIdentity}),
-      #a_string_matching(%r{ - \w  interface_removeGatewayResource}),
-      #a_string_matching(%r{ - \w  interface_removeIdentity}),
-      #a_string_matching(%r{ - \w  interface_setIdentityState}),
-      #a_string_matching(%r{ - \w  interface_updateGatewayResource}),
-      #a_string_matching(%r{ - \w  interface_updateGatewaySettings}),
-      #a_string_matching(%r{ - \w  interface_updateIdentity}),
-      #a_string_matching(%r{ - \w  interface_uploadContent}),
-      #a_string_matching(%r{ - \w  timer_timer (Application Event Handlers)}),
-      #a_string_matching(%r{ - \w  tsdb_exportJob (Application Event Handlers)}),
-      #a_string_matching(%r{ - \w  user_account (Application Event Handlers)}),
-      #a_string_matching(%r{ - \w  timer_timer}),
-      #a_string_matching(%r{ - \w  tsdb_exportJob}),
-      #a_string_matching(%r{ - \w  user_account}),
-      a_string_matching(/ M \w  timer_timer\.lua/),
-      a_string_matching(/ M \w  tsdb_exportJob\.lua/),
-      a_string_matching(/ M \w  user_account\.lua/),
+      a_string_matching(/ - \w  user_account\.lua/),
     )
   end
 
@@ -191,7 +158,10 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     it 'matches file path', :broken_on_windows do
-      out, err, status = Open3.capture3(capcmd('murano', 'status', '**/icon.png'))
+      # capcmd calls shellwords, which escapes strings so that Open3 doesn't
+      # expand them. E.g., **/ would expand to the local directory name.
+      status_cmd = capcmd('murano', 'status', '**/icon.png')
+      out, err, status = Open3.capture3(status_cmd)
       expect(err).to eq('')
       expect(out.lines).to match(
         [
@@ -231,7 +201,10 @@ RSpec.describe 'murano status', :cmd, :needs_password do
         File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
         'specs/resources.yaml',
       )
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'),
+        'test.murano'
+      )
     end
 
     it 'status' do
@@ -297,16 +270,9 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents_except_single_route(olines[5..11])
-      #expect(olines[12]).to eq("Only on remote server:\n")
-      #match_remote_boilerplate_v1_0_0_service(olines[13..15])
-      expect(olines[12]).to eq("Nothing new remotely\n")
-      #expect(olines[16]).to eq("Nothing that differs\n")
-      ##expect(olines[11]).to eq("Items that differ:\n")
-      ##expect(olines[12..12]).to contain_exactly(
-      ##  a_string_matching(%r{ M \w  .*services/devdata\.lua}),
-      ##)
-      expect(olines[13]).to eq("Items that differ:\n")
-      match_remote_boilerplate_v1_0_0_service(olines[14..16])
+      expect(olines[12]).to eq("Only on remote server:\n")
+      match_remote_boilerplate_v1_0_0_service(olines[13..13])
+      expect(olines[14]).to eq("Nothing that differs\n")
       expect(status.exitstatus).to eq(0)
     end
   end
@@ -326,7 +292,8 @@ RSpec.describe 'murano status', :cmd, :needs_password do
           default_page: 'index.html',
           assets: 'files',
           routes: 'routes/manyRoutes.lua',
-          # Note that singleRoute.lua is not included, so it won't be seen by status command.
+          # Note that singleRoute.lua is not included, so it won't be seen
+          # by status command.
           modules: {
             table_util: 'modules/table_util.lua',
           },
@@ -342,18 +309,14 @@ RSpec.describe 'murano status', :cmd, :needs_password do
 
     it 'status' do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
-      # pp out.split "\n"
       expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents_except_single_route(olines[5..11])
-      #expect(olines[12]).to eq("Only on remote server:\n")
-      #match_remote_boilerplate_v1_0_0_service(olines[13..15])
-      expect(olines[12]).to eq("Nothing new remotely\n")
-      #expect(olines[16]).to eq("Nothing that differs\n")
-      expect(olines[13]).to eq("Items that differ:\n")
-      match_remote_boilerplate_v1_0_0_service(olines[14..16])
+      expect(olines[12]).to eq("Only on remote server:\n")
+      match_remote_boilerplate_v1_0_0_service(olines[13..13])
+      expect(olines[14]).to eq("Nothing that differs\n")
       expect(status.exitstatus).to eq(0)
     end
   end

data/spec/cmd_syncdown_application_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.28 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 # NOTE: This file is a copy of, and subset of, cmd_syncdown_both_spec.rb.
@@ -48,8 +47,8 @@ RSpec.describe 'murano single sync', :cmd, :needs_password do
       expect(out_lines).to match_array(
         [
           "Adding item table_util\n",
-          a_string_starting_with('Updating item '),
-          "Updating item user_account\n",
+          "Removing item user_account\n",
+          "Updating item timer_timer\n",
           "Adding item POST_/api/fire\n",
           "Adding item PUT_/api/fire/{code}\n",
           "Adding item DELETE_/api/fire/{code}\n",
@@ -71,9 +70,7 @@ RSpec.describe 'murano single sync', :cmd, :needs_password do
       expect(out_lines).to match_array(
         [
           "Adding item table_util\n",
-          # 2017-08-08: This says updating now because timer.timer is undeletable.
-          #"Adding item timer_timer\n",
-          "Updating item timer_timer\n",
+          "Adding item timer_timer\n",
           "Adding item POST_/api/fire\n",
           "Adding item DELETE_/api/fire/{code}\n",
           "Adding item PUT_/api/fire/{code}\n",

data/spec/cmd_syncdown_both_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.25 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano syncdown', :cmd, :needs_password do
@@ -84,14 +83,11 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       expect(out_lines).to match_array(
         [
           "Adding item table_util\n",
-          "Updating item timer_timer\n",
-          # E.g., "Updating item i4kl64nn86xk00000_event\n":
+          # Removes: user_account, ijf5pb3juwd40000_event
+          a_string_starting_with('Removing item '),
+          a_string_starting_with('Removing item '),
+          # Updates: timer_timer
           a_string_starting_with('Updating item '),
-          "Updating item tsdb_exportJob\n",
-          "Updating item user_account\n",
-          # FIXME/2017-08-09: This test includes a fixture with "device2 data_in",
-          # which is deprecated, AFAIK [lb]. We convert it to "device2.event",
-          # but I think what we really want is to edit "<solution_id>.event".
           "Adding item device2_event\n",
           "Adding item POST_/api/fire\n",
           "Adding item PUT_/api/fire/{code}\n",
@@ -115,10 +111,9 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(
         [
+          "Updating local product resources\n",
           "Adding item table_util\n",
-          # 2017-08-08: This says updating now because timer.timer is undeletable.
-          #"Adding item timer_timer\n",
-          "Updating item timer_timer\n",
+          "Adding item timer_timer\n",
           "Adding item POST_/api/fire\n",
           "Adding item DELETE_/api/fire/{code}\n",
           "Adding item PUT_/api/fire/{code}\n",
@@ -128,16 +123,6 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
           "Adding item /\n",
         ]
       )
-      # Look for skipping missing location lines, e.g.,
-      #   "\e[33mSkipping missing location /tmp/d20170623-20035-17496y/project/modules\e[0m\n"
-      # 2017-07-03: Did I [lb] change syncdown not to complain about missing locations?
-      #expect(err.lines).to include(
-      #  a_string_ending_with("routes\e[0m\n"),
-      #  a_string_ending_with("files\e[0m\n"),
-      #  a_string_ending_with("modules\e[0m\n"),
-      #  a_string_ending_with("services\e[0m\n"),
-      #)
-      #expect(err).to eq('')
       expect(strip_fancy(err)).to start_with("\e[33mSkipping missing location '")
       expect(status.exitstatus).to eq(0)
 

data/spec/cmd_syncup_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano syncup', :cmd, :needs_password do
@@ -15,13 +14,17 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('syncupTestPrd')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'product', 'create', @product_name, '--save')
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
     @applctn_name = rname('syncupTestApp')
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'application', 'create', @applctn_name, '--save')
+    )
     expect(err).to eq('')
     soln_id = out
     expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
@@ -30,18 +33,24 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
     out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
     #expect(out).to a_string_starting_with("Linked product #{@product_name}")
     olines = out.lines
-    expect(strip_fancy(olines[0])).to eq("Linked '#{@product_name}' to '#{@applctn_name}'\n")
+    expect(strip_fancy(olines[0]))
+      .to eq("Linked '#{@product_name}' to '#{@applctn_name}'\n")
     expect(olines[1]).to eq("Created default event handler\n")
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @applctn_name, '-y'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', @product_name, '-y')
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -61,8 +70,10 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
     def verify_err_missing_location(err)
       elines = err.lines
       # E.g.,
-      #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Services)
-      #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Interfaces)
+      #   Skipping missing location
+      #     ‘/tmp/d20170809-7670-z315jn/project/services’ (Services)
+      #   Skipping missing location
+      #     ‘/tmp/d20170809-7670-z315jn/project/services’ (Interfaces)
       expect(elines).to(satisfy { |_v| elines.length == 2 })
       elines.each do |line|
         expect(strip_fancy(line)).to start_with("\e[33mSkipping missing location '")
@@ -73,40 +84,23 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
       outl = out.lines
       # The spec tests set --no-progress, so each sync action gets reported.
-      #expect(outl[0]).to eq("Adding item state\n")
-      #expect(outl[1]).to eq("Adding item temperature\n")
-      #expect(outl[2]).to eq("Adding item uptime\n")
-      #expect(outl[3]).to eq("Adding item humidity\n")
       (0..3).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
-      expect(outl[4]).to eq("Updating product resources\n")
+      expect(outl[4]).to eq("Updating remote product resources\n")
       # Windows is insane:
       #   "Adding item ........................Administrator.AppData.Local.Temp.2.d20170913-3860-pgji6g.project.modules.table_util\n"
-      #expect(outl[5]).to eq("Adding item table_util\n")
+      # So we can't do this:
+      #   expect(outl[5]).to eq("Adding item table_util\n")
       expect(outl[5]).to start_with('Adding item ')
       expect(outl[5]).to end_with("table_util\n")
-      #expect(outl[6]).to eq("Updating item c3juj9vnmec000000_event\n")
-      # The order isn't always consistent, so just do start_with.
-      #expect(outl[7]).to eq("Updating item timer_timer\n")
-      #expect(outl[8]).to eq("Updating item user_account\n")
-      #expect(outl[9]).to eq("Updating item tsdb_exportJob\n")
-      (6..9).each { |ln| expect(outl[ln]).to start_with('Updating item ') }
-      #expect(outl[10]).to eq("Adding item POST_/api/fire\n")
-      #expect(outl[11]).to eq("Adding item PUT_/api/fire/{code}\n")
-      #expect(outl[12]).to eq("Adding item DELETE_/api/fire/{code}\n")
-      #expect(outl[13]).to eq("Adding item GET_/api/onfire\n")
-      #expect(outl[14]).to eq("Adding item /icon.png\n")
-      #expect(outl[15]).to eq("Adding item /\n")
-      #expect(outl[16]).to eq("Adding item /js/script.js\n")
-      (10..16).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
+      (6..7).each { |ln| expect(outl[ln]).to start_with('Removing item ') }
+      (8..14).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
       verify_err_missing_location(err)
       expect(status.exitstatus).to eq(0)
 
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
-      #expect(out).to start_with(%(Adding:\nDeleting:\nChanging:\n))
-      #expect(out).to start_with(%(Nothing to add\nNothing to delete\nNothing to change\n))
-      expect(out).to start_with(%(Nothing new locally\nNothing new remotely\nNothing that differs\n))
-      # Due to timestamp races, there might be modules or services in Changing.
-      #expect(err).to eq('')
+      expect(out).to start_with(
+        %(Nothing new locally\nNothing new remotely\nNothing that differs\n)
+      )
       verify_err_missing_location(err)
       expect(status.exitstatus).to eq(0)
     end