From 765a50cd9d6b8f09077813040baa71cd8268839d Mon Sep 17 00:00:00 2001 From: Ryan Rotter Date: Thu, 12 Dec 2024 21:06:09 -0500 Subject: [PATCH] remove useless calls to with_mocked_nodes context --- spec/classes/all_roles_spec.rb | 1 - spec/classes/profile/http_fileserver_spec.rb | 3 --- spec/classes/role/chipmunk_spec.rb | 3 --- spec/classes/role/deb_server_spec.rb | 3 --- spec/classes/role/fulcrum_app_host_spec.rb | 3 --- spec/classes/role/fulcrum_standalone_spec.rb | 3 --- 6 files changed, 16 deletions(-) diff --git a/spec/classes/all_roles_spec.rb b/spec/classes/all_roles_spec.rb index 081da94d1..ab3e07370 100644 --- a/spec/classes/all_roles_spec.rb +++ b/spec/classes/all_roles_spec.rb @@ -4,7 +4,6 @@ # All Rights Reserved. Licensed according to the terms of the Revised # BSD License. See LICENSE.txt for details. require 'spec_helper' -require_relative '../support/contexts/with_mocked_nodes' def puppet_role_name_from(path) path.strip.gsub('/', '::').gsub(%r{^manifests}, 'nebula').gsub(%r{\.pp}, '') diff --git a/spec/classes/profile/http_fileserver_spec.rb b/spec/classes/profile/http_fileserver_spec.rb index a271c7e71..968097a7e 100644 --- a/spec/classes/profile/http_fileserver_spec.rb +++ b/spec/classes/profile/http_fileserver_spec.rb @@ -4,13 +4,10 @@ # All Rights Reserved. Licensed according to the terms of the Revised # BSD License. See LICENSE.txt for details. require 'spec_helper' -require_relative '../../support/contexts/with_mocked_nodes' describe 'nebula::profile::http_fileserver' do on_supported_os.each do |os, os_facts| context "on #{os}" do - include_context 'with mocked query for nodes in other datacenters' - let(:facts) { os_facts } let(:hiera_config) { 'spec/fixtures/hiera/deb_server_config.yaml' } let(:node) { 'foo.example.com' } # see spec/default_facts.yml diff --git a/spec/classes/role/chipmunk_spec.rb b/spec/classes/role/chipmunk_spec.rb index ab8619736..2e882bbcb 100644 --- a/spec/classes/role/chipmunk_spec.rb +++ b/spec/classes/role/chipmunk_spec.rb @@ -4,13 +4,10 @@ # All Rights Reserved. Licensed according to the terms of the Revised # BSD License. See LICENSE.txt for details. require 'spec_helper' -require_relative '../../support/contexts/with_mocked_nodes' describe 'nebula::role::chipmunk' do on_supported_os.each do |os, os_facts| context "on #{os}" do - include_context 'with mocked query for nodes in other datacenters' - let(:facts) { os_facts } let(:hiera_config) { 'spec/fixtures/hiera/chipmunk_config.yaml' } diff --git a/spec/classes/role/deb_server_spec.rb b/spec/classes/role/deb_server_spec.rb index 13bbdfa53..1b0394bdd 100644 --- a/spec/classes/role/deb_server_spec.rb +++ b/spec/classes/role/deb_server_spec.rb @@ -5,13 +5,10 @@ # BSD License. See LICENSE.txt for details. require 'spec_helper' require 'faker' -require_relative '../../support/contexts/with_mocked_nodes' describe 'nebula::role::deb_server' do on_supported_os.each do |os, os_facts| context "on #{os}" do - include_context 'with mocked query for nodes in other datacenters' - let(:facts) { os_facts.deep_merge(networking: { ip: Faker::Internet.ip_v4_address, interfaces: {} }) } let(:hiera_config) { 'spec/fixtures/hiera/deb_server_config.yaml' } diff --git a/spec/classes/role/fulcrum_app_host_spec.rb b/spec/classes/role/fulcrum_app_host_spec.rb index e58211322..93d0a9bc0 100644 --- a/spec/classes/role/fulcrum_app_host_spec.rb +++ b/spec/classes/role/fulcrum_app_host_spec.rb @@ -4,7 +4,6 @@ # All Rights Reserved. Licensed according to the terms of the Revised # BSD License. See LICENSE.txt for details. require 'spec_helper' -require_relative '../../support/contexts/with_mocked_nodes' describe 'nebula::role::fulcrum::app_host' do on_supported_os.each do |os, os_facts| @@ -12,8 +11,6 @@ let(:facts) { os_facts } let(:hiera_config) { 'spec/fixtures/hiera/fulcrum_config.yaml' } - include_context 'with mocked query for nodes in other datacenters', %w[one two], [] - it { is_expected.to compile } end end diff --git a/spec/classes/role/fulcrum_standalone_spec.rb b/spec/classes/role/fulcrum_standalone_spec.rb index 4df330590..a63a2c1d9 100644 --- a/spec/classes/role/fulcrum_standalone_spec.rb +++ b/spec/classes/role/fulcrum_standalone_spec.rb @@ -4,7 +4,6 @@ # All Rights Reserved. Licensed according to the terms of the Revised # BSD License. See LICENSE.txt for details. require 'spec_helper' -require_relative '../../support/contexts/with_mocked_nodes' describe 'nebula::role::fulcrum::standalone' do on_supported_os.each do |os, os_facts| @@ -12,8 +11,6 @@ let(:facts) { os_facts } let(:hiera_config) { 'spec/fixtures/hiera/fulcrum_config.yaml' } - include_context 'with mocked query for nodes in other datacenters', %w[one two], [] - it { is_expected.to compile } end end