Skip to content

Commit

Permalink
Bug 1361764 - remove skip_if stuff (#3808)
Browse files Browse the repository at this point in the history
* Bug 1361764 - remove skip_if stuff

Only one test is skipped. This removes all the skip_if infrastructure and
switches that test to use the pytest skipif decorator.

* Fix "make dockertest" file copy

This fixes the "rm -rf /app/*" line which wasn't removing all the files in
/app/ because the line needs to run in a shell for globbing to work.
  • Loading branch information
willkg committed Jun 12, 2017
1 parent ae914ae commit 356d78b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 87 deletions.
9 changes: 8 additions & 1 deletion docker/run_tests_in_docker.sh
Expand Up @@ -67,7 +67,14 @@ else
--user root \
--volumes-from socorro-repo \
--workdir /app \
local/socorro_webapp rm -rf "/app/*"
local/socorro_webapp sh -c "rm -rf /app/*"

# Verify files are gone
docker run \
--user root \
--volumes-from socorro-repo \
--workdir /app \
local/socorro_webapp ls -l /app/

# Copy the repo root into /app
docker cp . socorro-repo:/app
Expand Down
3 changes: 0 additions & 3 deletions socorro/unittest/__init__.py
@@ -1,3 +0,0 @@
from skip_if import skip_if

__all__ = ['skip_if']
9 changes: 4 additions & 5 deletions socorro/unittest/processor/test_symbol_cache_manager.py
Expand Up @@ -3,21 +3,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import os

from configman.dotdict import DotDict
from mock import Mock
from nose.tools import eq_, ok_
from socorro.unittest.testbase import TestCase
from socorro.unittest import skip_if

from configman.dotdict import DotDict
import pytest

from socorro.processor.symbol_cache_manager import (
EventHandler,
from_string_to_parse_size,
)
from socorro.unittest.testbase import TestCase


# =============================================================================
@skip_if(os.uname()[0] != 'Linux', 'Only test this if on Linux')
@pytest.mark.skipif(os.uname()[0] != 'Linux', reason='only run if on Linux')
class TestEventHandler(TestCase):

# -------------------------------------------------------------------------
Expand Down
48 changes: 0 additions & 48 deletions socorro/unittest/skip_if.py

This file was deleted.

30 changes: 0 additions & 30 deletions socorro/unittest/test_skip_if.py

This file was deleted.

0 comments on commit 356d78b

Please sign in to comment.