Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
c32c91d1
Unverified
Commit
c32c91d1
authored
6 years ago
by
Joas Schilling
Browse files
Options
Downloads
Patches
Plain Diff
Fix whitespaces
Signed-off-by:
Joas Schilling
<
coding@schilljs.com
>
parent
e18cc22e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
autotest.sh
+23
-22
23 additions, 22 deletions
autotest.sh
with
23 additions
and
22 deletions
autotest.sh
+
23
−
22
View file @
c32c91d1
...
...
@@ -204,21 +204,21 @@ function execute_tests {
else
if
[
-z
"
$DRONE
"
]
;
then
# no need to drop the DB when we are on CI
if
[
"mysql"
!=
"
$(
mysql
--version
|
grep
-o
mysql
)
"
]
;
then
echo
"Your mysql binary is not provided by mysql"
echo
"To use the docker container set the USEDOCKER environment variable"
exit
-1
fi
mysql
-u
"
$DATABASEUSER
"
-powncloud
-e
"DROP DATABASE IF EXISTS
$DATABASENAME
"
-h
$DATABASEHOST
||
true
else
DATABASEHOST
=
mysql
fi
if
[
"mysql"
!=
"
$(
mysql
--version
|
grep
-o
mysql
)
"
]
;
then
echo
"Your mysql binary is not provided by mysql"
echo
"To use the docker container set the USEDOCKER environment variable"
exit
-1
fi
mysql
-u
"
$DATABASEUSER
"
-powncloud
-e
"DROP DATABASE IF EXISTS
$DATABASENAME
"
-h
$DATABASEHOST
||
true
else
DATABASEHOST
=
mysql
fi
fi
echo
"Waiting for MySQL initialisation ..."
if
!
apps/files_external/tests/env/wait-for-connection
$DATABASEHOST
3306 600
;
then
echo
"[ERROR] Waited 600 seconds, no response"
>
&2
exit
1
fi
echo
"Waiting for MySQL initialisation ..."
if
!
apps/files_external/tests/env/wait-for-connection
$DATABASEHOST
3306 600
;
then
echo
"[ERROR] Waited 600 seconds, no response"
>
&2
exit
1
fi
fi
if
[
"
$DB
"
==
"mysqlmb4"
]
;
then
if
[
!
-z
"
$USEDOCKER
"
]
;
then
...
...
@@ -331,13 +331,13 @@ function execute_tests {
echo
"Waiting for Oracle initialization ... "
# Try to connect to the OCI host via sqlplus to ensure that the connection is already running
for
i
in
{
1..48
}
do
if
sqlplus
"autotest/owncloud@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=
$DATABASEHOST
)(Port=1521))(CONNECT_DATA=(SID=XE)))"
< /dev/null |
grep
'Connected to'
;
then
break
;
fi
sleep
5
done
for
i
in
{
1..48
}
do
if
sqlplus
"autotest/owncloud@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=
$DATABASEHOST
)(Port=1521))(CONNECT_DATA=(SID=XE)))"
< /dev/null |
grep
'Connected to'
;
then
break
;
fi
sleep
5
done
DATABASEUSER
=
autotest
DATABASENAME
=
'XE'
...
...
@@ -432,7 +432,8 @@ fi
# NOTES on pgsql:
# - su - postgres
# - createuser -P oc_autotest (enter password and enable superuser)
# - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
# - to enable dropdb I decided to add following line to pg_hba.conf
# (this is not the safest way but I don't care for the testing machine):
# local all all trust
#
# - for parallel executor support with EXECUTOR_NUMBER=0:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment