MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/spec/cmd_init_spec.rb

@@ -54,12 +54,12 @@ RSpec.describe 'murano init', :cmd do
       expecting += [
         "This business does not have any applications. Let's create one\n", # 7
         "\n", # 8
-        "Please enter the Application name: \n", # 9
+        "Enter the Application name [leave blank to skip]: \n", # 9
         a_string_starting_with('Created new Application: '), # 10
         "\n", # 11
         "This business does not have any products. Let's create one\n", # 12
         "\n", # 13
-        "Please enter the Product name: \n", # 14
+        "Enter the Product name [leave blank to skip]: \n", # 14
         a_string_starting_with('Created new Product: '), # 15
         "\n", # 16
       ]
@@ -107,17 +107,29 @@ RSpec.describe 'murano init', :cmd do
         "\n",
       ]
     end
+
+    # 2017-12-15: Currently:
+    #   services{product.id}_event.lua
+    #   services/user_account.lua
+    #   specs/resources.yaml
+    # 2018-04-11: Currently:
+    #   "Updating local product resources\n",
+    #   "Adding item config_service\n",
+    #   "Adding item config_status\n",
+    #   "Adding item user_account\n",
+    #   "Adding item g3vm2aa9xjfy00000_event\n",
+    #   "Adding item config_service\n",
+    #   "Adding item config_status\n",
+    #   "Synced 7 items\n",
     expecting += [
-      # 2017-12-15: Currently:
-      #   services{product.id}_event.lua
-      #   services/user_account.lua
-      #   specs/resources.yaml
       "Updating local product resources\n",
-      t.a_string_starting_with('Adding item '),
-      t.a_string_starting_with('Adding item '),
-      "Synced 3 items\n",
+    ]
+    6.times { expecting += [t.a_string_starting_with('Adding item ')] }
+    expecting += [
+      "Synced 7 items\n",
       "\n",
     ]
+
     expecting += [
       "Success!\n",
       "\n",
@@ -148,13 +160,17 @@ RSpec.describe 'murano init', :cmd do
         murano_solutions_expunge_yes
 
         @applctn_name = rname('initEmptyApp')
-        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)
 
         @product_name = rname('initEmptyPrd')
-        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)
@@ -162,19 +178,24 @@ RSpec.describe 'murano init', :cmd do
         # delete all of this so it is a empty directory.
         FileUtils.remove_entry('.murano')
       end
+
       after(:example) do
-        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)
 
-        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)
       end
 
-      it 'existing project' do
+      it 'existing project', :club_20s, :club_10s do
         # The test account will have one business, one product, and one application.
         # So it won't ask any questions.
         out, err, status = Open3.capture3(capcmd('murano', 'init'))
@@ -204,18 +225,22 @@ RSpec.describe 'murano init', :cmd do
         @product_name = rname('initCreatingPrd')
       end
       after(:example) do
-        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)
 
-        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)
       end
 
-      it 'existing project' do
+      it 'existing project', :club_20s, :club_10s do
         # The test account will have one business.
         # It will ask to create an application and product.
         # MAGIC_NUMBER: !!!! the 8 is hardcoded indention here !!!!
@@ -288,28 +313,37 @@ RSpec.describe 'murano init', :cmd do
       FileUtils.move('assets', 'files')
 
       @applctn_name = rname('initEmptyApp')
-      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)
 
       @product_name = rname('initEmptyPrd')
-      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)
     end
+
     after(:example) do
       Dir.chdir(ENV['HOME']) do
         if defined?(@product_name)
-          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)
         end
 
         if defined?(@applctn_name)
-          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)
@@ -317,7 +351,7 @@ RSpec.describe 'murano init', :cmd do
       end
     end
 
-    it 'without ProjectFile' do
+    it 'without ProjectFile', :club_20s, :club_10s do
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
@@ -340,7 +374,7 @@ RSpec.describe 'murano init', :cmd do
       expect(File.directory?('specs')).to be true
     end
 
-    it 'with ProjectFile' do
+    it 'with ProjectFile', :club_20s, :club_10s do
       FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
@@ -365,7 +399,7 @@ RSpec.describe 'murano init', :cmd do
       expect(File.directory?('specs')).to be true
     end
 
-    it 'with SolutionFile 0.2.0' do
+    it 'with SolutionFile 0.2.0', :club_20s, :club_10s do
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
           default_page: 'index.html',
@@ -405,7 +439,7 @@ RSpec.describe 'murano init', :cmd do
       expect(File.directory?('specs')).to be true
     end
 
-    it 'with SolutionFile 0.3.0' do
+    it 'with SolutionFile 0.3.0', :club_20s, :club_10s do
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
           default_page: 'index.html',

data/spec/cmd_keystore_spec.rb

@@ -14,6 +14,8 @@ RSpec.describe 'murano keystore', :cmd, :needs_password do
   include_context 'CI_CMD'
 
   before(:example) do
+    murano_solutions_expunge_yes
+
     @product_name = rname('keystoreTest')
     out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
     expect(err).to eq('')
@@ -25,6 +27,7 @@ RSpec.describe 'murano keystore', :cmd, :needs_password do
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
     out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
     expect(out).to eq('')
@@ -57,7 +60,7 @@ RSpec.describe 'murano keystore', :cmd, :needs_password do
     )
   end
 
-  it 'deletes' do
+  it 'deletes', :club_10s do
     out, err, status = Open3.capture3(capcmd('murano', 'keystore', 'delete', 'bob'))
     expect(out.chomp).to eq('')
     expect(err).to eq('')
@@ -69,7 +72,7 @@ RSpec.describe 'murano keystore', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it 'clearAll' do
+  it 'clearAll', :club_10s do
     out, err, status = Open3.capture3(capcmd('murano', 'keystore', 'set', 'another', 'value'))
     expect(out.chomp).to eq('')
     expect(err).to eq('')
@@ -86,7 +89,7 @@ RSpec.describe 'murano keystore', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it 'can call other commands' do
+  it 'can call other commands', :club_10s do
     out, err, status = Open3.capture3(capcmd('murano', 'keystore', 'command', 'lpush', 'another', 'value'))
     expect(out.chomp).to eq('1')
     expect(err).to eq('')

data/spec/cmd_link_spec.rb

@@ -37,9 +37,14 @@ RSpec.describe 'murano link', :cmd, :needs_password do
       context 'using commander' do
         it 'will not list' do
           # Because we run from the context of the rspec command, the :env
-          # config file will have loaded, so business.id will be set.
-          expect { murano_command_run('link list') }.to raise_error(SystemExit)
-          $exited_abnormally = false
+          # config file will have loaded, so business.id will not be set.
+          stdout, stderr = murano_command_run('link list')
+          expect(stdout).to eq(
+            %(Please change to a project directory, or run `murano init` to create a new project.\n)
+          )
+          expect(stderr).to eq(
+            %(The "link list" command only works in a Murano project.\n)
+          )
         end
       end
     end
@@ -49,7 +54,7 @@ RSpec.describe 'murano link', :cmd, :needs_password do
     before(:example) { project_up(skip_link: true) }
     after(:example) { project_down }
 
-    it 'links and lists' do
+    it 'links and lists', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
       olines = out.lines
 
@@ -71,7 +76,7 @@ RSpec.describe 'murano link', :cmd, :needs_password do
       expect(status.exitstatus).to eq(0)
     end
 
-    it 'unlinks' do
+    it 'unlinks', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
       #expect(out).to a_string_starting_with("Linked product #{@solz_name}")
       olines = out.lines

data/spec/cmd_logs_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'murano logs', :cmd, :needs_password do
     $cfg.set('net.protocol', 'http', :project)
     $cfg.set('application.id', 'XYZ', :project)
 
-    @acc = MrMurano::Account.instance
+    @acc = MrMurano::Account.new
     allow(@acc).to receive(:login_info).and_return(email: 'bob', password: 'v')
   end
 

data/spec/cmd_setting_application_spec.rb

@@ -11,16 +11,19 @@ require 'open3'
 require 'vine'
 require 'cmd_common'
 
-RSpec.describe 'murano setting', :cmd, :needs_password do
+RSpec.describe 'murano application setting', :cmd, :needs_password do
   include_context 'CI_CMD'
 
   before(:example) do
+    murano_solutions_expunge_yes
+
     @product_name = rname('settingtest')
     out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
     out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
     expect(out).to eq('')
@@ -56,7 +59,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
     # 'credentials'=>true}
 
     context 'a bool value' do
-      it 'Yes' do
+      it 'Yes', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'Yes'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -71,7 +74,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'true' do
+      it 'true', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'true'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -86,7 +89,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'on' do
+      it 'on', :club_30s, :club_20s, :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'on'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -101,7 +104,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it '1' do
+      it '1', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', '1'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -116,14 +119,14 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'bob' do
+      it 'bob', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'bob'))
         expect(err).to eq("\e[31mValue \"bob\" is not a bool type!\e[0m\n")
         expect(out).to eq('')
         expect(status.exitstatus).to eq(2)
       end
 
-      it 'No' do
+      it 'No', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'No'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -138,7 +141,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'false' do
+      it 'false', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'false'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -153,7 +156,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'off' do
+      it 'off', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', 'Off'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -168,7 +171,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it '0' do
+      it '0', :club_30s, :club_20s, :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool', '0'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -183,7 +186,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'on STDIN' do
+      it 'on STDIN', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'origin', '--bool'), stdin_data: 'true')
         expect(err).to eq('')
         expect(out).to eq('')
@@ -199,7 +202,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       end
     end
 
-    it 'a json array blob' do
+    it 'a json array blob', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'headers', '--json', '["fidget", "forgotten", "tokens"]'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -214,7 +217,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it 'a json array blob with STDIN' do
+    it 'a json array blob with STDIN', :club_10s do
       out, err, status = Open3.capture3(
         capcmd(
           'murano',
@@ -239,7 +242,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it 'an array' do
+    it 'an array', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'headers', '--array', 'fidget', 'forgotten', 'tokens'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -254,7 +257,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it 'appends an array' do
+    it 'appends an array', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Webservice.cors', 'headers', '--array', '--append', 'fidget', 'forgotten', 'tokens'))
       expect(err).to eq('')
       expect(out).to eq('')

data/spec/cmd_setting_product_spec.rb

@@ -11,7 +11,7 @@ require 'open3'
 require 'vine'
 require 'cmd_common'
 
-RSpec.describe 'murano setting', :cmd, :needs_password do
+RSpec.describe 'murano product setting', :cmd, :needs_password do
   include_context 'CI_CMD'
 
   before(:example) do
@@ -37,7 +37,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
     end
     # {'prefix'=>'', 'type'=>'opaque', 'options'=>{'casing'=>'mixed', 'length'=>0}}
 
-    it 'a string value' do
+    it 'a string value', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', 'fidget'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -52,7 +52,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it 'a forced string value' do
+    it 'a forced string value', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string', 'fidget'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -67,7 +67,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it 'a forced string value on STDIN' do
+    it 'a forced string value on STDIN', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string'), stdin_data: 'fidget')
       expect(err).to eq('')
       expect(out).to eq('')
@@ -99,7 +99,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
 #    end
 
     context 'a number value' do
-      it 'integer 12' do
+      it 'integer 12', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -114,7 +114,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it 'float 12.67' do
+      it 'float 12.67', :club_10s do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12.67'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -191,7 +191,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
 #      expect(json_after).to match(@json_before)
 #    end
 
-    it 'merges into a dictionary' do
+    it 'merges into a dictionary', :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', '.', '--dict', '--merge', 'prefix', 'tix', 'type', 'base10'))
       expect(err).to eq('')
       expect(out).to eq('')

data/spec/cmd_status_spec.rb

@@ -104,7 +104,11 @@ RSpec.describe 'murano status', :cmd, :needs_password do
 
   def match_remote_boilerplate_v1_0_0_service(slice)
     expect(slice).to include(
+      a_string_matching(/ - \w  config_service/),
+      a_string_matching(/ - \w  config_status/),
       a_string_matching(/ - \w  user_account\.lua/),
+      a_string_matching(/ - \w  config_service/),
+      a_string_matching(/ - \w  config_status/),
     )
   end
 
@@ -119,7 +123,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       )
     end
 
-    it 'status' do
+    it 'status', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       # Two problems with this output.
@@ -129,8 +133,10 @@ 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(olines[5..12])
-      #expect(olines[13]).to eq("Only on remote server:\n")
-      expect(olines[13]).to eq("Nothing new remotely\n")
+      #expect(olines[13]).to eq("Nothing new remotely\n")
+      expect(olines[13]).to eq("Only on remote server:\n")
+      expect(olines[14]).to eq(" - I  config_service\n")
+      expect(olines[15]).to eq(" - I  config_status\n")
       # FIMXE/2017-06-23: We should DRY this long list which is same in each test.
       # FIXME/2017-06-23: The interfaces the server creates for a new project
       #   will problem vary depending on what modules are loaded, and are likely
@@ -151,13 +157,13 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       #    a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
       #  )
       #else
-      expect(olines[14]).to eq("Nothing that differs\n")
+      expect(olines[16]).to eq("Nothing that differs\n")
       #end
 
       expect(status.exitstatus).to eq(0)
     end
 
-    it 'matches file path', :broken_on_windows do
+    it 'matches file path', :broken_on_windows, :club_20s, :club_10s do
       # 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')
@@ -174,7 +180,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       expect(status.exitstatus).to eq(0)
     end
 
-    it 'matches route', :broken_on_windows do
+    it 'matches route', :broken_on_windows, :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'status', '#put#'))
       expect(err).to eq('')
       expect(out.lines).to match(
@@ -207,14 +213,18 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       )
     end
 
-    it 'status' do
+    it 'status', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       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(olines[5..12])
-      expect(olines[13]).to eq("Nothing new remotely\n")
+      #expect(olines[13]).to eq("Nothing new remotely\n")
+      expect(olines[13]).to eq("Only on remote server:\n")
+      expect(olines[14]).to eq(" - I  config_service\n")
+      expect(olines[15]).to eq(" - I  config_status\n")
 
       # NOTE: On Windows, touch doesn't work, so items differ.
       # Check the platform, e.g., 'linux-gnu', or other.
@@ -222,13 +232,13 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       #)
       if OS.windows?
-        expect(olines[14]).to eq("Items that differ:\n")
-        expect(olines[15..16]).to include(
+        expect(olines[16]).to eq("Items that differ:\n")
+        expect(olines[17..18]).to include(
           a_string_matching(%r{ M \w  .*services/timer_timer\.lua}),
           a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
         )
       else
-        expect(olines[14]).to eq("Nothing that differs\n")
+        expect(olines[16]).to eq("Nothing that differs\n")
       end
 
       expect(status.exitstatus).to eq(0)
@@ -262,7 +272,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       end
     end
 
-    it 'status' do
+    it 'status', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       # Not a single match, because the order of items within groups can shift
@@ -271,8 +281,8 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       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..13])
-      expect(olines[14]).to eq("Nothing that differs\n")
+      match_remote_boilerplate_v1_0_0_service(olines[13..17])
+      expect(olines[18]).to eq("Nothing that differs\n")
       expect(status.exitstatus).to eq(0)
     end
   end
@@ -307,7 +317,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       end
     end
 
-    it 'status' do
+    it 'status', :club_20s, :club_10s do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       olines = out.lines
@@ -315,8 +325,8 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       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..13])
-      expect(olines[14]).to eq("Nothing that differs\n")
+      match_remote_boilerplate_v1_0_0_service(olines[13..17])
+      expect(olines[18]).to eq("Nothing that differs\n")
       expect(status.exitstatus).to eq(0)
     end
   end