Skip to content

Commit

Permalink
Import fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
blorente committed Mar 28, 2019
1 parent 2616cfa commit 69d23d7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from pants.base.build_environment import get_buildroot
from pants.util.contextutil import temporary_dir
from pants.util.dirutil import fast_relpath, safe_file_dump
from pants_test.pants_run_integration_test import ensure_daemon, daemon_blacklist, \
skip_if_tests_are_hermetic
from pants_test.pants_run_integration_test import (daemon_blacklist, ensure_daemon,
skip_if_tests_are_hermetic)
from pants_test.pantsd.pantsd_integration_test_base import PantsDaemonIntegrationTestBase


Expand Down
1 change: 0 additions & 1 deletion tests/python/pants_test/pants_run_integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import os
import shutil
import unittest

from builtins import open
from contextlib import contextmanager
from operator import eq, ne
Expand Down
6 changes: 3 additions & 3 deletions tests/python/pants_test/pantsd/test_pantsd_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
import signal
import threading
import time
from builtins import open, range, zip

import pytest
from builtins import open, range, zip

from pants.util.contextutil import environment_as, temporary_dir
from pants.util.dirutil import rm_rf, safe_file_dump, safe_mkdir, touch
from pants_test.pants_run_integration_test import read_pantsd_log, daemon_blacklist, \
skip_if_tests_are_hermetic, skip_if_pantsd
from pants_test.pants_run_integration_test import (daemon_blacklist, read_pantsd_log,
skip_if_pantsd, skip_if_tests_are_hermetic)
from pants_test.pantsd.pantsd_integration_test_base import PantsDaemonIntegrationTestBase
from pants_test.testutils.process_test_util import no_lingering_process_by_command
from pants_test.testutils.py2_compat import assertNotRegex, assertRegex
Expand Down

0 comments on commit 69d23d7

Please sign in to comment.