couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1104622 - /couchdb/branches/1.1.x/test/etap/
Date Tue, 17 May 2011 23:14:26 GMT
Author: davisp
Date: Tue May 17 23:14:25 2011
New Revision: 1104622

URL: http://svn.apache.org/viewvc?rev=1104622&view=rev
Log:
Backported os daemon tests from trunk.

This reduces the chance that these tests fail due to
timing differences by avoding booting of an Erlang
VM as an os daemon.


Added:
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.sh
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh   (with props)
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh   (with props)
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh   (with props)
Removed:
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.es
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.es
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.es
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.es
Modified:
    couchdb/branches/1.1.x/test/etap/   (props changed)
    couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.t
    couchdb/branches/1.1.x/test/etap/Makefile.am

Propchange: couchdb/branches/1.1.x/test/etap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 17 23:14:25 2011
@@ -5,4 +5,5 @@ Makefile.in
 test_util.erl
 test_util.beam
 test_web.beam
+test_cfg_register
 run

Added: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.sh
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.sh?rev=1104622&view=auto
==============================================================================
--- couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.sh (added)
+++ couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.1.sh Tue May 17 23:14:25 2011
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+# 
+# Please do not make this file executable as that's the error being tested.
+
+sleep 5

Added: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh?rev=1104622&view=auto
==============================================================================
--- couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh (added)
+++ couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh Tue May 17 23:14:25 2011
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+exit 1

Propchange: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.2.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh?rev=1104622&view=auto
==============================================================================
--- couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh (added)
+++ couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh Tue May 17 23:14:25 2011
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+sleep 1

Propchange: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.3.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh?rev=1104622&view=auto
==============================================================================
--- couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh (added)
+++ couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh Tue May 17 23:14:25 2011
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+sleep 2

Propchange: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.4.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.t?rev=1104622&r1=1104621&r2=1104622&view=diff
==============================================================================
--- couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.t (original)
+++ couchdb/branches/1.1.x/test/etap/172-os-daemon-errors.t Tue May 17 23:14:25 2011
@@ -30,16 +30,16 @@ config_files() ->
     ]).
 
 bad_perms() ->
-    test_util:source_file("test/etap/172-os-daemon-errors.1.es").
+    test_util:source_file("test/etap/172-os-daemon-errors.1.sh").
 
 die_on_boot() ->
-    test_util:source_file("test/etap/172-os-daemon-errors.2.es").
+    test_util:source_file("test/etap/172-os-daemon-errors.2.sh").
 
 die_quickly() ->
-    test_util:source_file("test/etap/172-os-daemon-errors.3.es").
+    test_util:source_file("test/etap/172-os-daemon-errors.3.sh").
 
 can_reboot() ->
-    test_util:source_file("test/etap/172-os-daemon-errors.4.es").
+    test_util:source_file("test/etap/172-os-daemon-errors.4.sh").
 
 main(_) ->
     test_util:init_code_path(),

Modified: couchdb/branches/1.1.x/test/etap/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/Makefile.am?rev=1104622&r1=1104621&r2=1104622&view=diff
==============================================================================
--- couchdb/branches/1.1.x/test/etap/Makefile.am (original)
+++ couchdb/branches/1.1.x/test/etap/Makefile.am Tue May 17 23:14:25 2011
@@ -77,10 +77,10 @@ EXTRA_DIST = \
 	170-os-daemons.t \
     171-os-daemons-config.es \
     171-os-daemons-config.t \
-    172-os-daemon-errors.1.es \
-    172-os-daemon-errors.2.es \
-    172-os-daemon-errors.3.es \
-    172-os-daemon-errors.4.es \
+    172-os-daemon-errors.1.sh \
+    172-os-daemon-errors.2.sh \
+    172-os-daemon-errors.3.sh \
+    172-os-daemon-errors.4.sh \
     172-os-daemon-errors.t \
 	173-os-daemon-cfg-register.t \
 	180-http-proxy.ini \



Mime
View raw message