Browse Source

#712 Reorder Conan install

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Uilian Ries 6 years ago
parent
commit
613ab2a62b
2 changed files with 3 additions and 3 deletions
  1. 2 2
      conan/test_package/conanfile.py
  2. 1 1
      conan/travis/install.sh

+ 2 - 2
conan/test_package/conanfile.py

@@ -18,13 +18,13 @@ class TestPackageConan(ConanFile):
 
     def test(self):
         assert os.path.isfile(os.path.join(self.deps_cpp_info["civetweb"].rootpath, "licenses", "LICENSE.md"))
-        bin_path = os.path.join(os.getcwd(), "bin", "test_package")
+        bin_path = os.path.join("bin", "test_package")
         run_vars = RunEnvironment(self).vars
         with tools.environment_append(run_vars):
             if self.settings.os == "Macos":
                 run_vars["DYLD_LIBRARY_PATH"] = os.environ.get('DYLD_LIBRARY_PATH', '')
             process = subprocess.Popen([bin_path], shell=True, env=run_vars)
-            time.sleep(2)
+            time.sleep(3)
             response = requests.get("http://localhost:8080/example")
             assert response.ok
             process.kill()

+ 1 - 1
conan/travis/install.sh

@@ -18,4 +18,4 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv activate conan
 fi
 
-pip install -U conan_package_tools conan
+pip install -U conan conan_package_tools