Skip to content

Commit 91e594f

Browse files
committed
Update some tests for parallel changes
1 parent 7c3691b commit 91e594f

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

spec/octocatalog-diff/integration/cli_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@
232232
expect(stderr).not_to match(/DEBUG -- : :header => \(Symbol\) :default/)
233233
expect(stderr).not_to match(/DEBUG -- : Loaded 3 settings from/)
234234
expect(stderr).not_to match(/INFO -- : Exiting now because --config-test was specified/)
235-
expect(stderr).to match(/Catalog for 'to' \(.\) failed to compile with/)
236235
expect(stderr).to match(/ArgumentError: Unable to compute facts for node./)
237236
end
238237
end

spec/octocatalog-diff/integration/convert_file_resources_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
)
161161
expect(result[:exitcode]).to eq(-1)
162162
expect(result[:exception]).to be_a_kind_of(OctocatalogDiff::Errors::CatalogError)
163-
expect(result[:exception].message).to match(/failed to compile with Errno::ENOENT/)
163+
expect(result[:exception].message).to match(/Errno::ENOENT: No such file or directory/)
164164
expect(result[:exception].message).to match(%r{Unable to resolve 'puppet:///modules/test/foo-new'})
165165
end
166166
end

spec/octocatalog-diff/tests/util/catalogs_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def valid?
198198
logger, _logger_string = OctocatalogDiff::Spec.setup_logger
199199
testobj = OctocatalogDiff::Util::Catalogs.new(options, logger)
200200
re = %r{ENC.*/asdkfjlfjkalksdfads wasn't found}
201-
expect { testobj.catalogs }.to raise_error(Errno::ENOENT, re)
201+
expect { testobj.catalogs }.to raise_error(OctocatalogDiff::Errors::CatalogError, re)
202202
end
203203
end
204204
end
@@ -211,7 +211,7 @@ def valid?
211211
logger, _logger_string = OctocatalogDiff::Spec.setup_logger
212212
testobj = OctocatalogDiff::Util::Catalogs.new(options, logger)
213213
re = %r{hiera.yaml.*/asdkfjlfjkalksdfads\) wasn't found}
214-
expect { testobj.catalogs }.to raise_error(Errno::ENOENT, re)
214+
expect { testobj.catalogs }.to raise_error(OctocatalogDiff::Errors::CatalogError, re)
215215
end
216216
end
217217
end

0 commit comments

Comments
 (0)