Skip to content

Commit 71ff59b

Browse files
committed
Fix some tests conflicts
1 parent 74c7329 commit 71ff59b

27 files changed

+54
-0
lines changed

t/integration/concurrency.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
1010

11+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
12+
1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;
1315
$dir =~ s{^\./}{};

t/integration/encoding.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use File::Temp qw/tempdir/;
55
use Test2::Harness::Util::File::JSONL;
66

77
use Test2::Harness::Util::JSON qw/decode_json/;
8+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
9+
810

911
my $dir = __FILE__;
1012
$dir =~ s{\.t$}{}g;

t/integration/failed.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use App::Yath::Tester qw/yath/;
77
use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012

1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;

t/integration/failure_cases.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use App::Yath::Tester qw/yath/;
77
my $dir = __FILE__;
88
$dir =~ s{\.t$}{}g;
99
$dir =~ s{^\./}{};
10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012

1113
my %CUSTOM = (
1214
"timeout.tx" => ['--et', 2],

t/integration/help.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use File::Spec;
66
use App::Yath::Tester qw/yath/;
77
use App::Yath::Util qw/find_yath/;
88

9+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
10+
911
yath(
1012
command => 'help',
1113
args => [],

t/integration/includes.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use File::Spec;
55

66
use App::Yath::Tester qw/yath/;
77

8+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
9+
810
use App::Yath::Util qw/find_yath/;
911
find_yath(); # cache result before we chdir
1012

t/integration/init.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use File::Temp qw/tempdir/;
44
use File::Spec;
55
use Cwd qw/cwd/;
66

7+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
8+
79
use App::Yath::Tester qw/yath/;
810
use App::Yath::Util qw/find_yath/;
911
find_yath(); # cache result before we chdir

t/integration/log_dir.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use App::Yath::Tester qw/yath/;
44
use File::Temp qw/tempdir/;
55

66
use File::Spec;
7+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
8+
79

810
my $dir = __FILE__;
911
$dir =~ s{\.t$}{}g;

t/integration/persist.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use File::Spec;
66

77
use App::Yath::Tester qw/yath/;
88
use Test2::Harness::Util::File::JSONL;
9+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
10+
911

1012
use Test2::Harness::Util::JSON qw/decode_json/;
1113

t/integration/plugin.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use Test2::V0;
44
use App::Yath::Tester qw/yath/;
55
use File::Temp qw/tempdir/;
66
use Test2::Harness::Util::File::JSONL;
7+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
8+
79

810
use Test2::Harness::Util::JSON qw/decode_json/;
911

t/integration/preload.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ use Test2::Harness::Util::JSON qw/decode_json/;
1111

1212
use Test2::Util qw/CAN_REALLY_FORK/;
1313

14+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
15+
1416
skip_all "Cannot fork, skipping preload test"
1517
unless CAN_REALLY_FORK;
1618

t/integration/projects.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ use Test2::Harness::Util::File::JSONL;
1111

1212
use Test2::Harness::Util::JSON qw/decode_json/;
1313

14+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
15+
1416
my $dir = __FILE__;
1517
$dir =~ s{\.t$}{}g;
1618
$dir =~ s{^\./}{};

t/integration/reload.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ use Test2::V0;
22
# HARNESS-DURATION-LONG
33
#use Test2::Plugin::DieOnFail;
44

5+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
6+
57
use File::Temp qw/tempdir/;
68
use File::Spec;
79

t/integration/reload_syntax_error.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ use Test2::Harness::Util qw/clean_path/;
1111

1212
use Test2::Harness::Util::JSON qw/decode_json/;
1313

14+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
15+
1416
use Test2::Util qw/CAN_REALLY_FORK/;
1517
skip_all "Cannot fork, skipping preload test"
1618
if $ENV{T2_NO_FORK} || !CAN_REALLY_FORK;

t/integration/replay.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use File::Spec;
55

66
use App::Yath::Tester qw/yath/;
77
use Test2::Harness::Util::File::JSONL;
8+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
9+
810

911
use Test2::Harness::Util::JSON qw/decode_json/;
1012

t/integration/resource.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
1010

11+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
12+
1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;
1315
$dir =~ s{^\./}{};

t/integration/retry.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ my $dir = __FILE__;
77
$dir =~ s{\.t$}{}g;
88
$dir =~ s{^\./}{};
99

10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012
my $project = "asgadfgds";
1113

1214
run_tests('test');

t/integration/show_buffer_timeout.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
1010

11+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
12+
1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;
1315
$dir =~ s{^\./}{};

t/integration/signals.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ my $dir = __FILE__;
1111
$dir =~ s{\.t$}{}g;
1212
$dir =~ s{^\./}{};
1313

14+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
15+
1416
for ( 1..10 ) {
1517
# the tests are flapping when using something like '%INC = %INC'....
1618
# make sure the issue is fixed by running them a few times

t/integration/smoke.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use App::Yath::Tester qw/yath/;
77
use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012

1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;

t/integration/speedtag.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use File::Copy qw/copy/;
77
use Test2::Harness::Util::File::JSONL;
88

99
use App::Yath::Tester qw/yath/;
10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012

1113
use App::Yath::Util qw/find_yath/;
1214
find_yath(); # cache result before we chdir

t/integration/stamps.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use App::Yath::Tester qw/yath/;
77
use Test2::Harness::Util::File::JSONL;
88

99
use Test2::Harness::Util::JSON qw/decode_json/;
10+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
11+
1012

1113
my $dir = __FILE__;
1214
$dir =~ s{\.t$}{}g;

t/integration/tapsubtest.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use Test2::V0;
22

33
use App::Yath::Tester qw/yath/;
4+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
5+
46

57
my $dir = __FILE__;
68
$dir =~ s{\.t$}{}g;

t/integration/test-w.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use Test2::V0;
22

33
use App::Yath::Tester qw/yath/;
4+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
5+
46

57
my $dir = __FILE__;
68
$dir =~ s{\.t$}{}g;

t/integration/test.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use Test2::Harness::Util::File::JSONL;
99

1010
use Test2::Harness::Util qw/clean_path/;
1111
use Test2::Harness::Util::JSON qw/decode_json/;
12+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
13+
1214

1315
my $dir = __FILE__;
1416
$dir =~ s{\.t$}{}g;

t/integration/times.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use Test2::V0;
22

3+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
4+
35
use File::Temp qw/tempdir/;
46
use File::Spec;
57

t/integration/verbose_env.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use Test2::V0;
22

3+
use Test2::Plugin::Immiscible(sub { $ENV{TEST2_HARNESS_ACTIVE} ? 1 : 0 });
4+
35
use Config qw/%Config/;
46
use File::Temp qw/tempfile/;
57
use File::Spec;

0 commit comments

Comments
 (0)