[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 168/205: test1606: verify speedcheck
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 168/205: test1606: verify speedcheck |
Date: |
Thu, 20 Apr 2017 16:21:48 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit d2bdc98754cf3c30ac2afa4cf708337cf3f129a1
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Apr 6 15:34:46 2017 +0200
test1606: verify speedcheck
---
tests/data/Makefile.inc | 2 +-
tests/data/test1606 | 26 ++++++++++++++
tests/unit/Makefile.inc | 5 ++-
tests/unit/unit1606.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index d89d53249..fb9505146 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -165,7 +165,7 @@ test1525 test1526 test1527 test1528 test1529 test1530
test1531 test1532 \
test1533 test1534 test1535 test1536 \
test1540 test1541 \
\
-test1600 test1601 test1602 test1603 test1604 test1605 \
+test1600 test1601 test1602 test1603 test1604 test1605 test1606 \
\
test1700 test1701 test1702 \
\
diff --git a/tests/data/test1606 b/tests/data/test1606
new file mode 100644
index 000000000..15488d407
--- /dev/null
+++ b/tests/data/test1606
@@ -0,0 +1,26 @@
+<testcase>
+<info>
+<keywords>
+unittest
+speedcheck
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+verify speedcheck
+ </name>
+<tool>
+unit1606
+</tool>
+</client>
+
+</testcase>
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index e7db96f50..ee01627df 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -7,7 +7,7 @@ UNITFILES = curlcheck.h \
# These are all unit test programs
UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307
\
unit1308 unit1309 unit1330 unit1394 unit1395 unit1396 unit1397 unit1398
\
- unit1600 unit1601 unit1602 unit1603 unit1604 unit1605
+ unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606
unit1300_SOURCES = unit1300.c $(UNITFILES)
unit1300_CPPFLAGS = $(AM_CPPFLAGS)
@@ -74,3 +74,6 @@ unit1604_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
unit1605_SOURCES = unit1605.c $(UNITFILES)
unit1605_CPPFLAGS = $(AM_CPPFLAGS)
+
+unit1606_SOURCES = unit1606.c $(UNITFILES)
+unit1606_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/unit/unit1606.c b/tests/unit/unit1606.c
new file mode 100644
index 000000000..fdc0ec381
--- /dev/null
+++ b/tests/unit/unit1606.c
@@ -0,0 +1,90 @@
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+#include "curlcheck.h"
+
+#include "speedcheck.h"
+#include "urldata.h"
+
+static CURLcode unit_setup(void)
+{
+ return CURLE_OK;
+}
+
+static void unit_stop(void)
+{
+
+}
+
+static int runawhile(struct Curl_easy *easy,
+ long time_limit,
+ long speed_limit,
+ curl_off_t speed,
+ int dec)
+{
+ int counter = 1;
+ struct timeval now = {1, 0};
+ CURLcode result;
+ int finaltime;
+
+ curl_easy_setopt(easy, CURLOPT_LOW_SPEED_LIMIT, speed_limit);
+ curl_easy_setopt(easy, CURLOPT_LOW_SPEED_TIME, time_limit);
+ Curl_speedinit(easy);
+
+ do {
+ /* fake the current transfer speed */
+ easy->progress.current_speed = speed;
+ result = Curl_speedcheck(easy, now);
+ if(result)
+ break;
+ /* step the time */
+ now.tv_sec = ++counter;
+ speed -= dec;
+ } while(counter < 100);
+
+ finaltime = (int)(now.tv_sec - 1);
+
+ printf("%s\n", easy->state.buffer);
+ return finaltime;
+}
+
+UNITTEST_START
+{
+ struct Curl_easy *easy = curl_easy_init();
+
+ fail_unless(runawhile(easy, 41, 41, 40, 0) == 41,
+ "wrong low speed timeout");
+ fail_unless(runawhile(easy, 21, 21, 20, 0) == 21,
+ "wrong low speed timeout");
+ fail_unless(runawhile(easy, 60, 60, 40, 0) == 60,
+ "wrong log speed timeout");
+ fail_unless(runawhile(easy, 50, 50, 40, 0) == 50,
+ "wrong log speed timeout");
+ fail_unless(runawhile(easy, 40, 40, 40, 0) == 99,
+ "should not time out");
+ fail_unless(runawhile(easy, 10, 50, 100, 2) == 36,
+ "bad timeout");
+
+ curl_easy_cleanup(easy);
+
+ return 0;
+}
+UNITTEST_STOP
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 138/205: dist: add missing files to the tarball, (continued)
- [GNUnet-SVN] [gnurl] 138/205: dist: add missing files to the tarball, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 204/205: THANKS: add contributors from 7.54.0 release notes, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 161/205: tool_operate: fix MinGW compiler warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 179/205: libcurl-thread.3: fixed a bad macro that caused test 1140 to fail, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 184/205: polarssl: unbreak build with versions < 1.3.8, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 185/205: system.h: fix mingw section, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 137/205: cmake: fix build with cmake 2.8.12.2, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 192/205: RELEASE-NOTES: synced with 1451271e0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 134/205: curl: fix callback functions to match prototype, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 175/205: INSTALL.md: fix secure transport configure arguments, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 168/205: test1606: verify speedcheck,
gnunet <=
- [GNUnet-SVN] [gnurl] 128/205: cmake: add more missing files to the dist, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 97/205: cmake: build manual pages (including curl.1), gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 106/205: openssl: fall back on SSL_ERROR_* string when no error detail, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 136/205: ssh: fix narrowing conversion warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 141/205: CTestConfig.cmake: removed, unused, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 139/205: docs/index.html: removed, was not shipped anyway, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 173/205: BUGS: "Bugs in old versions", gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 158/205: tests: added test for Curl_splaygetbest to unit1309, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 146/205: tests/server/util: remove in6addr_any for recent MinGW, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 165/205: nss: fix build after e60fe20fdf94e829ba5fce33f7a9d6c281149f7d, gnunet, 2017/04/20