diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-06-02 09:10:28 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-06-02 09:10:28 +0000 |
| commit | a49e935ee3e2e07d90da7c78b543a5592a3b1a4a (patch) | |
| tree | 960dbaa58768be8e1e05dc098743d560ee3ec4c8 /spec/integration/python | |
| parent | 0b976fcffe0a9b8e80587adb076bcdf279c9331c (diff) | |
| parent | 16b452b82b08ecaeef1dde3c1cb6fd2ab0446947 (diff) | |
Merge branch '212919-pull-custom-conan-packages' into 'master'v3.11.0
Allow custom conan configuration
See merge request gitlab-org/security-products/license-management!159
Diffstat (limited to 'spec/integration/python')
| -rw-r--r-- | spec/integration/python/pip_spec.rb | 2 | ||||
| -rw-r--r-- | spec/integration/python/pipenv_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb index f47bbe6..0ba3d0e 100644 --- a/spec/integration/python/pip_spec.rb +++ b/spec/integration/python/pip_spec.rb @@ -127,7 +127,7 @@ RSpec.describe "pip" do end end - context "when connecting to a private package repository with self signed certificate" do + context "when connecting to a private package repository with self signed certificate", environment: 'offline' do let(:index_url) { "https://#{private_pypi_host}/simple" } let(:bundle) { fixture_file_content('python/pypi.crt') } diff --git a/spec/integration/python/pipenv_spec.rb b/spec/integration/python/pipenv_spec.rb index ccc2585..b95f1fa 100644 --- a/spec/integration/python/pipenv_spec.rb +++ b/spec/integration/python/pipenv_spec.rb @@ -202,7 +202,7 @@ RSpec.describe "pipenv" do end end - context "when connecting to a private package repository with self signed certificate" do + context "when connecting to a private package repository with self signed certificate", environment: 'offline' do let(:index_url) { "https://#{private_pypi_host}/simple" } let(:bundle) { fixture_file_content('python/pypi.crt') } |
