Commit e49786f3 authored by Matthieu Muffato's avatar Matthieu Muffato

Merge branch 'version/2.1' into version/2.2

* version/2.1:
  Go back to the original directory
  bugfix: chdir does not return the current path
  Added a warning about using too-recent versions of the core API
parents ebef92d5 6ed5b530
......@@ -21,6 +21,7 @@ use warnings;
use Test::More tests => 8;
use Cwd 'getcwd';
use Capture::Tiny ':all';
use File::Temp qw{tempdir};
......@@ -30,7 +31,8 @@ BEGIN {
#########################
my $dir = tempdir CLEANUP => 1;
my $original = chdir $dir;
my $original = getcwd;
chdir $dir;
my $rs_stdout = Bio::EnsEMBL::Hive::Utils::RedirectStack->new(\*STDOUT);
my $stdout = capture_stdout {
......
......@@ -33,6 +33,7 @@ use File::Basename ();
$ENV{'EHIVE_ROOT_DIR'} ||= File::Basename::dirname( File::Basename::dirname( File::Basename::dirname( Cwd::realpath($0) ) ) );
my $dir = tempdir CLEANUP => 1;
my $original = Cwd::getcwd;
chdir $dir;
my $pipeline_url = 'sqlite:///ehive_test_pipeline_db';
......@@ -87,3 +88,5 @@ is($ada_a->count_all(), 1, "still 1 entry in the analysis_data table");
done_testing();
chdir $original;
......@@ -31,7 +31,8 @@ $ENV{'EHIVE_ROOT_DIR'} ||= File::Basename::dirname( File::Basename::dirname( Fil
use Bio::EnsEMBL::Hive::DBSQL::DBAdaptor;
my $dir = tempdir CLEANUP => 1;
my $orig = chdir $dir;
my $orig = Cwd::getcwd;
chdir $dir;
my $sqlite_url = "sqlite:///test_db";
# -no_sql_schema_version_check is needed because the database does not have the eHive schema
......
......@@ -32,7 +32,8 @@ use Bio::EnsEMBL::Hive::Utils::Test qw(init_pipeline runWorker);
$ENV{'EHIVE_ROOT_DIR'} ||= File::Basename::dirname( File::Basename::dirname( File::Basename::dirname( Cwd::realpath($0) ) ) );
my $dir = tempdir CLEANUP => 1;
my $original = chdir $dir;
my $original = Cwd::getcwd;
chdir $dir;
my $ehive_test_pipeline_urls = $ENV{'EHIVE_TEST_PIPELINE_URLS'} || 'sqlite:///ehive_test_pipeline_db';
my $ehive_test_pipeconfigs = $ENV{'EHIVE_TEST_PIPECONFIGS'} || 'LongMult_conf LongMultSt_conf LongMultWf_conf';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment