Skip to content
Commits on Source (2)
......@@ -29,3 +29,11 @@ Description: Other random fixes in test suite
# -*- coding: utf-8 -*-
import sys
@@ -698,6 +700,7 @@ class InitializeTests(TestCase):
line = next(line for line in stderr.splitlines() if line.strip().endswith(fn))
assert line.strip().startswith('modified'), line
+ @pytest.mark.skipif(True, reason="Debian: At package build time /usr/bin/conda does not exist yet so checking for it does not make any sense")
@pytest.mark.skipif(on_win, reason="unix-only test")
def test_init_sh_user_unix(self):
with tempdir() as conda_temp_prefix:
Author: Andreas Tille <tille@debian.org>
Last-Update: Sun, 10 Mar 2019 09:33:50 +0100
Description: Ignore test trying to verify installation of Windows executable files
--- a/tests/core/test_initialize.py
+++ b/tests/core/test_initialize.py
@@ -27,6 +27,7 @@ from conda.gateways.disk.create import c
from conda.models.enums import LinkType
from tests.helpers import tempdir
import re
+import pytest
try:
from unittest.mock import Mock, patch
@@ -365,6 +366,7 @@ class InitializeTests(TestCase):
result = make_entry_point(conda_exe_path, conda_prefix, 'conda.entry.point', 'run')
assert result == Result.NO_CHANGE
+ @pytest.mark.skipif(True, reason="Debian: There is no point to test for windows .exe files on Debian")
def test_make_entry_point_exe(self):
with tempdir() as conda_temp_prefix:
conda_prefix = abspath(sys.prefix)
@@ -484,6 +486,7 @@ class InitializeTests(TestCase):
result = install_conda_csh(target_path, conda_prefix)
assert result == Result.NO_CHANGE
+ @pytest.mark.skipif(True, reason="Debian: There is no point to test for windows .bat files on Debian")
def test_install_condabin_conda_bat(self):
with tempdir() as conda_temp_prefix:
conda_prefix = abspath(sys.prefix)
......@@ -7,3 +7,4 @@ ignore_test_accessing_remote.patch
ignore_tests_using_charizard.patch
ignore_test_trying_to_delete_python3.patch
fix_other_test_issues.patch
no_windows_files_in_test.patch
......@@ -6,9 +6,12 @@ Description: There is a circular dependency in the test suite between
--- a/tests/test_link_order.py
+++ b/tests/test_link_order.py
@@ -10,7 +10,7 @@ import tempfile
@@ -8,9 +8,9 @@ import os
import shutil
import tempfile
from .test_create import run_command, Commands
-from .test_create import run_command, Commands
+#from .test_create import run_command, Commands
-from conda_build import api
+# from conda_build import api
......@@ -24,6 +27,14 @@ Description: There is a circular dependency in the test suite between
class TestLinkOrder(unittest.TestCase):
def setUp(self):
self.prefix = tempfile.mkdtemp()
@@ -26,6 +28,7 @@ class TestLinkOrder(unittest.TestCase):
def tearDown(self):
shutil.rmtree(self.prefix)
+ @pytest.mark.skipif(True, reason="Debian: needs definition from test_create.py which is excluded from Debian tests")
@pytest.mark.integration
def test_link_order_post_link_actions(self):
stdout, stderr, _ = run_command(Commands.CREATE, self.prefix, "c_post_link_package", "-c", "conda-test")
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -9,7 +9,7 @@ from conda.exceptions import CondaUpgrad
......
......@@ -2,6 +2,7 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
export LANGUAGE=en
include /usr/share/dpkg/default.mk
# this provides:
......