summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-06-02 10:43:21 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-06-02 10:49:55 (GMT)
commit8004bbaa1b31b14dd4c4d3886b5f57b103bf7405 (patch) (side-by-side diff)
treea6fd826c284fe1e7131c4852c2964b6029ca758d
parent685600d72b0c300f94c0c69dc0a16c4ebb230a21 (diff)
downloadpies-8004bbaa1b31b14dd4c4d3886b5f57b103bf7405.tar.gz
pies-8004bbaa1b31b14dd4c4d3886b5f57b103bf7405.tar.bz2
Speed up tests.
Presence of the ~/.netrc file can slow down execution because of eventual DNS calls in hostcmp. Provide an option to disable netrc parsing and use it in tests. * src/piesctl-cl.opt: New option: --no-netrc. * doc/pies.texi: Document --no-netrc * src/piesctl.c (shttp_connect): Don't read ~/.netrc if given --no-netrc. * tests/env.at: Pass --no-netrc to piesctl. * tests/respawn.at: Likewise. * tests/shell.at: Likewise. * tests/shutdown.at: Likewise. * tests/startup.at: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/pies.texi4
-rw-r--r--src/piesctl-cl.opt6
-rw-r--r--src/piesctl.c4
-rw-r--r--tests/env.at4
-rw-r--r--tests/respawn.at2
-rw-r--r--tests/shell.at2
-rw-r--r--tests/shutdown.at4
-rw-r--r--tests/startup.at4
8 files changed, 21 insertions, 9 deletions
diff --git a/doc/pies.texi b/doc/pies.texi
index 1a798e1..b77a40c 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -3024,6 +3024,10 @@ purposes.
@itemx --instance=@var{inst}
Talk to @command{pies} instance @var{inst}.
+@item --no-netc
+@itemx -N
+Don't read @file{~/.netrc} file.
+
@item -u @var{url}
@itemx --url=@var{url}
Specifies the URL of the communication socket. @xref{piesctl url},
diff --git a/src/piesctl-cl.opt b/src/piesctl-cl.opt
index f7eaf2a..ebdfec4 100644
--- a/src/piesctl-cl.opt
+++ b/src/piesctl-cl.opt
@@ -69,6 +69,12 @@ BEGIN
}
END
+OPTION(no-netrc,N,,
+ [<don't read ~/.netrc file>])
+BEGIN
+ no_netrc_option = 1;
+END
+
GROUP(Preprocessor)
OPTION(include-directory,I,DIR,
diff --git a/src/piesctl.c b/src/piesctl.c
index 0cd2736..4c777d7 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -49,6 +49,7 @@ char const *instance = "pies";
char *config_file;
char default_config_file[] = SYSCONFDIR "/piesctl.conf";
int preprocess_only;
+int no_netrc_option;
int verbose;
int dump;
@@ -543,7 +544,8 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
if (pies_url_copy (&conn->url, url))
grecs_alloc_die ();
- netrc_scan (conn->url);
+ if (!no_netrc_option)
+ netrc_scan (conn->url);
return conn;
}
diff --git a/tests/env.at b/tests/env.at
index c293c65..18b0e52 100644
--- a/tests/env.at
+++ b/tests/env.at
@@ -15,12 +15,12 @@ component envtest {
stdout file "$PWD/log";
return-code 0 {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
}
_EOT
-to 3 \
+to 5 \
envtest -exec \
$abs_top_builddir/src/pies --foreground --stderr \
--config-file control.conf --config-file envtest.conf 2>errlog
diff --git a/tests/respawn.at b/tests/respawn.at
index 0ba60dc..ab29f11 100644
--- a/tests/respawn.at
+++ b/tests/respawn.at
@@ -27,7 +27,7 @@ component test {
chdir $PWD;
return-code 1 {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
}
_EOT
diff --git a/tests/shell.at b/tests/shell.at
index e3d104b..b459d02 100644
--- a/tests/shell.at
+++ b/tests/shell.at
@@ -29,7 +29,7 @@ component test {
chdir $PWD;
return-code 1 {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
}
_EOT
diff --git a/tests/shutdown.at b/tests/shutdown.at
index 1c2a4ef..24a4504 100644
--- a/tests/shutdown.at
+++ b/tests/shutdown.at
@@ -29,7 +29,7 @@ component test {
chdir $PWD;
return-code 1 {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
}
@@ -42,7 +42,7 @@ _EOT
set -e
to 5 \
pies --foreground --stderr \
- --config-file control.conf --config-file pies.conf 2>errlog
+ --config-file control.conf --config-file pies.conf --debug 1 2>errlog
cat shutdown
],
diff --git a/tests/startup.at b/tests/startup.at
index 22ad25b..b65f9f6 100644
--- a/tests/startup.at
+++ b/tests/startup.at
@@ -39,7 +39,7 @@ component test {
stderr file "log.err";
return-code * {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
}
_EOT
@@ -47,7 +47,7 @@ _EOT
set -e
to 5 \
pies --foreground --stderr \
- --config-file control.conf --config-file pies.conf 2>errlog
+ --config-file control.conf --config-file pies.conf --debug 1 2>errlog
cat log.out
cat log.err >&2

Return to:

Send suggestions and report system problems to the System administrator.