Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_DnsResolver / bc4b9508d6d5bb209e1ddacd64efc38c0a8f1e19
commitbc4b9508d6d5bb209e1ddacd64efc38c0a8f1e19[log] [tgz]
authorMike Yu <yumike@google.com>Fri Mar 20 13:14:00 2020 +0800
committerMike Yu <yumike@google.com>Fri Mar 20 17:23:37 2020 +0800
treef432792b09ff8fa741b0ee04a5e559c6096cbdee
parentdde25bcdf602f9c941473324281675d9d3e1eed9 [diff]
Fix flaky test RepeatedSetup_NoRedundantPrivateDnsValidation

There is a time gap between the time when PrivateDnsConfiguration
reports onPrivateDnsValidationEvent and the time when
PrivateDnsConfiguration updates its map which is used for tracking
validation threads. If the test starts a subsequent setup (which expects
the resolver to begin a new validation) before PrivateDnsConfiguration
updates the map, the expected validation won't start because
PrivateDnsConfiguration thinks the previous validation hasn't finished.

This change is a workaround which adds waiting time to avoid the timing
issue, and the test running time increases 300ms.

Bug: 150678049
Bug: 151990391
Test: resolv_integration_test passed
Change-Id: I176d7d20b7edc79b37b954602961c149aef64348
1 file changed
tree: f432792b09ff8fa741b0ee04a5e559c6096cbdee
  1. aidl_api/
  2. apex/
  3. binder/
  4. include/
  5. tests/
  6. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  7. .editorconfig
  8. Android.bp
  9. Dns64Configuration.cpp
  10. Dns64Configuration.h
  11. DnsProxyListener.cpp
  12. DnsProxyListener.h
  13. DnsQueryLog.cpp
  14. DnsQueryLog.h
  15. DnsQueryLogTest.cpp
  16. DnsResolver.cpp
  17. DnsResolver.h
  18. DnsResolverService.cpp
  19. DnsResolverService.h
  20. DnsStats.cpp
  21. DnsStats.h
  22. DnsStatsTest.cpp
  23. DnsTlsDispatcher.cpp
  24. DnsTlsDispatcher.h
  25. DnsTlsQueryMap.cpp
  26. DnsTlsQueryMap.h
  27. DnsTlsServer.cpp
  28. DnsTlsServer.h
  29. DnsTlsSessionCache.cpp
  30. DnsTlsSessionCache.h
  31. DnsTlsSocket.cpp
  32. DnsTlsSocket.h
  33. DnsTlsSocketFactory.h
  34. DnsTlsTransport.cpp
  35. DnsTlsTransport.h
  36. getaddrinfo.cpp
  37. getaddrinfo.h
  38. gethnamaddr.cpp
  39. gethnamaddr.h
  40. hostent.h
  41. IDnsTlsSocket.h
  42. IDnsTlsSocketFactory.h
  43. IDnsTlsSocketObserver.h
  44. libnetd_resolv.map.txt
  45. LockedQueue.h
  46. NOTICE
  47. OWNERS
  48. params.h
  49. PREUPLOAD.cfg
  50. PrivateDnsConfiguration.cpp
  51. PrivateDnsConfiguration.h
  52. README-DoT.md
  53. README.md
  54. res_cache.cpp
  55. res_comp.cpp
  56. res_comp.h
  57. res_debug.cpp
  58. res_debug.h
  59. res_init.cpp
  60. res_init.h
  61. res_mkquery.cpp
  62. res_query.cpp
  63. res_send.cpp
  64. res_send.h
  65. res_stats.cpp
  66. resolv_cache.h
  67. resolv_cache_unit_test.cpp
  68. resolv_callback_unit_test.cpp
  69. resolv_private.h
  70. resolv_tls_unit_test.cpp
  71. resolv_unit_test.cpp
  72. ResolverController.cpp
  73. ResolverController.h
  74. ResolverEventReporter.cpp
  75. ResolverEventReporter.h
  76. ResolverStats.h
  77. sethostent.cpp
  78. stats.h
  79. stats.proto
  80. TEST_MAPPING
  81. util.cpp
  82. util.h
README.md

Logging

This code uses LOG(X) for logging. Log levels are VERBOSE,DEBUG,INFO,WARNING and ERROR. The default setting is WARNING and logs relate to WARNING and ERROR will be shown. If you want to enable the DEBUG level logs, using following command. adb shell service call dnsresolver 10 i32 1 VERBOSE 0 DEBUG 1 INFO 2 WARNING 3 ERROR 4 Verbose resolver logs could contain PII -- do NOT enable in production builds.