<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16019">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix upgrade test in presence of ~/.sqliterc<br><br>db_upgrade_test.sh:<br><br>- If an ~/.sqliterc file exists, it causes output of '-- Loading resources from<br>  ~/.sqliterc'. Use -batch option to omit that.<br><br>- To make sure that column headers are off when required, add -noheaders in<br>  some places.<br><br>Change-Id: I279a39984563594a4a3914b2ce3d803ad9468fe8<br>---<br>M tests/db_upgrade/db_upgrade_test.sh<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/19/16019/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/db_upgrade/db_upgrade_test.sh b/tests/db_upgrade/db_upgrade_test.sh</span><br><span>index bf56c56..8e2b498 100755</span><br><span>--- a/tests/db_upgrade/db_upgrade_test.sh</span><br><span>+++ b/tests/db_upgrade/db_upgrade_test.sh</span><br><span>@@ -11,21 +11,21 @@</span><br><span> </span><br><span> dump_sorted_schema(){</span><br><span>      db_file="$1"</span><br><span style="color: hsl(0, 100%, 40%);">-  tables="$(sqlite3 "$db_file" "SELECT name FROM sqlite_master WHERE type = 'table' order by name")"</span><br><span style="color: hsl(120, 100%, 40%);">+      tables="$(sqlite3 -batch -noheader "$db_file" "SELECT name FROM sqlite_master WHERE type = 'table' order by name")"</span><br><span>    for table in $tables; do</span><br><span>             echo</span><br><span>                 echo "Table: $table"</span><br><span style="color: hsl(0, 100%, 40%);">-          sqlite3 -header "$db_file" "SELECT name,type,\"notnull\",dflt_value,pk FROM PRAGMA_TABLE_INFO('$table') order by name;"</span><br><span style="color: hsl(120, 100%, 40%);">+         sqlite3 -batch -header "$db_file" "SELECT name,type,\"notnull\",dflt_value,pk FROM PRAGMA_TABLE_INFO('$table') order by name;"</span><br><span>                 echo</span><br><span>                 echo "Table $table contents:"</span><br><span style="color: hsl(0, 100%, 40%);">-         columns="$(sqlite3 "$db_file" "SELECT name FROM PRAGMA_TABLE_INFO('$table') order by name;")"</span><br><span style="color: hsl(0, 100%, 40%);">-             sqlite3 -header "$db_file" "SELECT $(echo $columns | sed 's/ /,/g') from $table;"</span><br><span style="color: hsl(120, 100%, 40%);">+         columns="$(sqlite3 -batch -noheader "$db_file" "SELECT name FROM PRAGMA_TABLE_INFO('$table') order by name;")"</span><br><span style="color: hsl(120, 100%, 40%);">+          sqlite3 -batch -header "$db_file" "SELECT $(echo $columns | sed 's/ /,/g') from $table;"</span><br><span>         done</span><br><span> }</span><br><span> </span><br><span> rm -f "$db"</span><br><span> echo "Creating db in schema version 0"</span><br><span style="color: hsl(0, 100%, 40%);">-sqlite3 "$db" < "$srcdir/hlr_db_v0.sql"</span><br><span style="color: hsl(120, 100%, 40%);">+sqlite3 -batch "$db" < "$srcdir/hlr_db_v0.sql"</span><br><span> </span><br><span> echo</span><br><span> echo "Version 0 db:"</span><br><span>@@ -61,7 +61,7 @@</span><br><span>            -n OsmoHLR -p 4258 \</span><br><span>                 -r "$osmo_hlr -c $cfg -l $mint_db" \</span><br><span>               "$srcdir/create_subscribers.vty"</span><br><span style="color: hsl(0, 100%, 40%);">-      sqlite3 "$mint_db" < "$srcdir/create_subscribers_step2.sql"</span><br><span style="color: hsl(120, 100%, 40%);">+    sqlite3 -batch "$mint_db" < "$srcdir/create_subscribers_step2.sql"</span><br><span> </span><br><span>        set +x</span><br><span>       test_dump="$builddir/test.dump"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16019">change 16019</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/16019"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I279a39984563594a4a3914b2ce3d803ad9468fe8 </div>
<div style="display:none"> Gerrit-Change-Number: 16019 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>