- tor-commits - lists.torproject.org

[doctor/master] Warn earlier about expiring certificates.
by karsten＠torproject.org 03 Jan '12

03 Jan '12

commit 3d48a8dc5b43065f81976fadbfeb0ca566481309 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 3 15:11:53 2012 +0100 Warn earlier about expiring certificates. Now we warn - just once 3 months before the certificate expires, - every week 2 months before the certificate expires, and - every day 2 weeks before the certificate expires. --- src/org/torproject/doctor/Checker.java | 53 +++++++++++++++++----- src/org/torproject/doctor/StatusFileReport.java | 12 +++++- src/org/torproject/doctor/Warning.java | 12 ++++- 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index ab7e92d..dc1ea46 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -294,27 +294,56 @@ public class Checker { /* Check whether any of the authority keys expire in the next 14 * days. */ private void checkAuthorityKeys() { - SortedMap<String, String> expiringCertificates = + SortedMap<String, String> certificatesExpiringInThreeMonths = + new TreeMap<String, String>(); + SortedMap<String, String> certificatesExpiringInTwoMonths = + new TreeMap<String, String>(); + SortedMap<String, String> certificatesExpiringInTwoWeeks = new TreeMap<String, String>(); long now = System.currentTimeMillis(); for (RelayNetworkStatusVote vote : this.downloadedVotes) { long voteDirKeyExpiresMillis = vote.getDirKeyExpiresMillis(); if (voteDirKeyExpiresMillis - 14L * 24L * 60L * 60L * 1000L < now) { - expiringCertificates.put(vote.getNickname(), + certificatesExpiringInTwoWeeks.put(vote.getNickname(), + dateTimeFormat.format(voteDirKeyExpiresMillis)); + } else if (voteDirKeyExpiresMillis - 60L * 24L * 60L * 60L * 1000L < + now) { + certificatesExpiringInTwoMonths.put(vote.getNickname(), + dateTimeFormat.format(voteDirKeyExpiresMillis)); + } else if (voteDirKeyExpiresMillis - 90L * 24L * 60L * 60L * 1000L < + now) { + certificatesExpiringInThreeMonths.put(vote.getNickname(), dateTimeFormat.format(voteDirKeyExpiresMillis)); } } - if (!expiringCertificates.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (Map.Entry<String, String> e : - expiringCertificates.entrySet()) { - String dir = e.getKey(); - String timestamp = e.getValue(); - sb.append(", " + dir + " " + timestamp); - } - this.warnings.put(Warning.CertificateExpiresSoon, - sb.toString().substring(2)); + if (!certificatesExpiringInThreeMonths.isEmpty()) { + this.warnAboutExpiringCertificates( + Warning.CertificateExpiresInThreeMonths, + certificatesExpiringInThreeMonths); + } + if (!certificatesExpiringInTwoMonths.isEmpty()) { + this.warnAboutExpiringCertificates( + Warning.CertificateExpiresInTwoMonths, + certificatesExpiringInTwoMonths); + } + if (!certificatesExpiringInTwoWeeks.isEmpty()) { + this.warnAboutExpiringCertificates( + Warning.CertificateExpiresInTwoWeeks, + certificatesExpiringInTwoWeeks); + } + } + + private void warnAboutExpiringCertificates(Warning warningType, + SortedMap<String, String> expiringCertificates) { + StringBuilder sb = new StringBuilder(); + for (Map.Entry<String, String> e : + expiringCertificates.entrySet()) { + String dir = e.getKey(); + String timestamp = e.getValue(); + sb.append(", " + dir + " " + timestamp); } + String details = sb.toString().substring(2); + this.warnings.put(warningType, sb.toString().substring(2)); } /* Check if any votes are missing. */ diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index a8838b6..994704a 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -112,7 +112,17 @@ public class StatusFileReport { + "conflicting or invalid consensus parameters: " + details, 150L * 60L * 1000L); break; - case CertificateExpiresSoon: + case CertificateExpiresInThreeMonths: + warningStrings.put("The certificates of the following " + + "directory authorities expire within the next three " + + "months: " + details, 5L * 7L * 24L * 60L * 60L * 1000L); + break; + case CertificateExpiresInTwoMonths: + warningStrings.put("The certificates of the following " + + "directory authorities expire within the next two " + + "months: " + details, 7L * 24L * 60L * 60L * 1000L); + break; + case CertificateExpiresInTwoWeeks: warningStrings.put("The certificates of the following " + "directory authorities expire within the next 14 days: " + details, 24L * 60L * 60L * 1000L); diff --git a/src/org/torproject/doctor/Warning.java b/src/org/torproject/doctor/Warning.java index 1684f89..eee4342 100644 --- a/src/org/torproject/doctor/Warning.java +++ b/src/org/torproject/doctor/Warning.java @@ -33,8 +33,16 @@ public enum Warning { ConflictingOrInvalidConsensusParams, /* The certificate(s) of one or more directory authorities expire within - * the next 14 days. */ - CertificateExpiresSoon, + * the next three months, which we warn about just once. */ + CertificateExpiresInThreeMonths, + + /* The certificate(s) of one or more directory authorities expire within + * the next two months, which we warn about once per week. */ + CertificateExpiresInTwoMonths, + + /* The certificate(s) of one or more directory authorities expire within + * the next 14 days, which we warn about once per day. */ + CertificateExpiresInTwoWeeks, /* The vote(s) of one or more directory authorities are missing. */ VotesMissing,

1 0

r25282: {website} add another mirror, refresh the mirrors table. (in website/trunk: . include)
by Andrew Lewman 03 Jan '12

03 Jan '12

Author: phobos Date: 2012-01-03 12:57:58 +0000 (Tue, 03 Jan 2012) New Revision: 25282 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add another mirror, refresh the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-03 12:16:34 UTC (rev 25281) +++ website/trunk/include/mirrors-table.wmi 2012-01-03 12:57:58 UTC (rev 25282) @@ -86,36 +86,36 @@ <tr> - <td>IS</td> + <td>US</td> - <td>torproject.is</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>US</td> + <td>AT</td> - <td>BarkerJr</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -171,23 +171,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>BarkerJr</td> @@ -375,15 +358,15 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -392,15 +375,15 @@ <tr> - <td>IS</td> + <td>FR</td> - <td>TheOnionRouter</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -460,15 +443,15 @@ <tr> - <td>US</td> + <td>IS</td> - <td>AskApache</td> + <td>torproject.is</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,6 +460,40 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td>TheOnionRouter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IN</td> <td>India Tor Fans</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-03 12:16:34 UTC (rev 25281) +++ website/trunk/update-mirrors.pl 2012-01-03 12:57:58 UTC (rev 25282) @@ -785,6 +785,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror048 => { + adminContact => "", + orgName => "", + isoCC => "AT", + subRegion => "", + region => "AT", + ipv4 => "True", + ipv6 => "True", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.dont-know-me.at/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.dont-know-me.at/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Jan '12

03 Jan '12

commit 22a55a2c925074524ecc87201b523b307114a6ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 3 12:45:11 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 118 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 61 insertions(+), 57 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index eff6771..c450848 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-03 12:13+0000\n" +"PO-Revision-Date: 2012-01-03 12:38+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr "TCP 연결 사용 (제어포트)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "경로:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -182,7 +182,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "경디" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -1588,19 +1588,19 @@ msgstr "알 수 없음" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "디버그" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "정보" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "주의" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "경고" msgctxt "LogTreeItem" msgid "Error" @@ -1608,7 +1608,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "알 수 없음" msgctxt "MainWindow" msgid "Start Tor" @@ -2667,15 +2667,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" @@ -3239,11 +3239,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "귀하의 Tor 소프트웨어는 \"지원 범위 밖입니다\"." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Tor 네트워크에 연결됨" msgctxt "StatusEventWidget" msgid "" @@ -3253,7 +3253,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor 소프트웨어 오류" msgctxt "StatusEventWidget" msgid "" @@ -3310,7 +3310,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "알 수 없는 SOCKS 프로트콜" msgctxt "StatusEventWidget" msgid "" @@ -3343,7 +3343,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "DNS 하이제킹 감지" msgctxt "StatusEventWidget" msgid "" @@ -3351,6 +3351,8 @@ msgid "" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." msgstr "" +"Tor는 귀하의 DNS 제공자가 존재하지 않는 도메인에 대해 잘못된 응답을 하는 것을 감지하였습니다. 몇몇의 ISP와 OpenDNS와 " +"같은 다른 DNS 제공자들은 그들의 검색이나 광고 페이지를 표시하기 위해 이러한 행위를 한다고 알려져 있습니다." msgctxt "StatusEventWidget" msgid "" @@ -3358,6 +3360,8 @@ msgid "" "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." msgstr "" +"Tor는 귀하의 DNS 제공자가 존재하는 도메인에 대해 잘못된 응답을 하는 것을 발견했습니다. 클라이언트가 정확한 DNS의 응답을 " +"제공하기 위해 Tor 네트워크에 의존하므로, 귀하의 중계는 출구 중계로 구성되지 않습니다." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" @@ -3372,15 +3376,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "서버 포트 접근 테스트 성공!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "중계 서버 포트는 Tor 네트워크에서 접근 가능합니다!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "서버 포트 접근 테스트 실패" msgctxt "StatusEventWidget" msgid "" @@ -3507,19 +3511,19 @@ msgstr "" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "잘라내기" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "복사" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "붙이기" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "되돌리기" msgctxt "TorrcDialog" msgid "Redo" @@ -3527,7 +3531,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "모두 선택" msgctxt "TorrcDialog" msgid "Apply all" @@ -3535,7 +3539,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "데이타 파일을 위한 폴더 지정" msgctxt "TorrcDialog" msgid "Error connecting to Tor" @@ -3591,115 +3595,115 @@ msgstr "알 수 없는 오류" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "" +msgstr "UPnP 장치 찾기" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "" +msgstr "디렉토리 포트 매핑 업데이트" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "" +msgstr "중계 포트 매핑 업데이트" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "" +msgstr "테스트가 성공적으로 끝났습니다." msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" -msgstr "" +msgstr "UPnP 지원 테스트" msgctxt "UPNPTestDialog" msgid "Testing Universal Plug & Play Support" -msgstr "" +msgstr " Universal Plug & Play 지원 테스트" msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because it could " "not find '%1'." -msgstr "" +msgstr "'%1'을 찾을 수 없어서 Vidalia는 업데이트를 확인하지 못했습니다." msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "" +msgstr "Tor 업데이트 프로세스가 예상치 못하게 종료되어서 Vidalia는 업데이트를 확인하지 못했습니다." msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." -msgstr "" +msgstr "업데이트 확인 중..." msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "숨기기" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." -msgstr "" +msgstr "업데이트 다운로드 중..." msgctxt "UpdateProgressDialog" msgid "Installing updated software..." -msgstr "" +msgstr "업데이트된 소프트웨어 설치 중..." msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." -msgstr "" +msgstr "완료되었습니다! 귀하의 소프트웨어는 지원 범위 내입니다." msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "확인" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "소프트웨어 업데이트" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." -msgstr "" +msgstr "업데이트 확인 중..." msgctxt "UpdateProgressDialog" msgid "Cancel" -msgstr "" +msgstr "취소" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" -msgstr "" +msgstr "소프트웨어 업데이트 가능" msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" -msgstr "" +msgstr "나중에 알리기" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "설치" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" -msgstr "" +msgstr "다음의 업데이트된 소프트웨어 패키지가 설치할 준비가 끝났습니다." msgctxt "UpdatesAvailableDialog" msgid "Package" -msgstr "" +msgstr "패키지" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "버전" msgctxt "VMessageBox" msgid "OK" -msgstr "" +msgstr "확인" msgctxt "VMessageBox" msgid "Cancel" -msgstr "" +msgstr "취소" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "예" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "아니오" msgctxt "VMessageBox" msgid "Help" @@ -3731,23 +3735,23 @@ msgstr "탐색" msgctxt "Vidalia" msgid "Invalid Argument" -msgstr "" +msgstr "잘못된 인수" msgctxt "Vidalia" msgid "Vidalia is already running" -msgstr "" +msgstr "Vidalia는 이미 작동중 입니다." msgctxt "Vidalia" msgid "Displays this usage message and exits." -msgstr "" +msgstr "이 메시지를 표시하고 종료합니다." msgctxt "Vidalia" msgid "Resets ALL stored Vidalia settings." -msgstr "" +msgstr "\"모든\" Vidalia의 설정을 초기화합니다." msgctxt "Vidalia" msgid "Sets the directory Vidalia uses for data files." -msgstr "" +msgstr "데이타 파일을 위한 폴더 지정" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile."

1 0

r25281: {website} We are shutting down community-support, help@rt is the new a (website/trunk/docs/en)
by Runa Sandvik 03 Jan '12

03 Jan '12

Author: runa Date: 2012-01-03 12:16:34 +0000 (Tue, 03 Jan 2012) New Revision: 25281 Modified: website/trunk/docs/en/faq.wml Log: We are shutting down community-support, help@rt is the new address Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2012-01-02 04:57:06 UTC (rev 25280) +++ website/trunk/docs/en/faq.wml 2012-01-03 12:16:34 UTC (rev 25281) @@ -385,7 +385,7 @@ <li>Join our <a href="irc://irc.oftc.net#tor">irc channel</a> and state the issue and wait for help.</li> <li>Send an email to <a - href="mailto:community-support@lists.torproject.org">community-support</a>. + href="mailto:help@rt.torproject.org">help(a)rt.torproject.org</a>. These are volunteers who may be able to help you but you may not get a response for days.</li> </ol>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Jan '12

03 Jan '12

commit f45f96ff73ddc8e7ec14feebfb03b53dbeea9bca Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 3 12:15:13 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 152 +++++++++++++++++++++++++++--------------------------- 1 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 139bb58..eff6771 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-03 11:43+0000\n" +"PO-Revision-Date: 2012-01-03 12:13+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -20,23 +20,23 @@ msgstr "" msgctxt "AboutDialog" msgid "About Vidalia" -msgstr "비달리아에 관하여" +msgstr "미발표된 모든 서비스를 시도하는 중의 에러" msgctxt "AboutDialog" msgid "License" -msgstr "라이센스" +msgstr "귀하가 저장하고자 하는 각각의 서비스에 대한 서비스 디렉토리와 가상 포트를 설정해 주십시오." msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "Vidalia 0.2.0" +msgstr "목표는 주소나, 포트, 주소:포트만 포함할 것입니다." msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "Tor 0.2.0.32" +msgstr "디렉토리가 이미 다른 서비스에서 사용중 입니다." msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "Qt 4.4.2" +msgstr "~로부터" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." @@ -45,15 +45,15 @@ msgstr "'%1' 은 올바른 IP주소가 아닙니다." msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "비밀번호 인증 방식을 선택하셨지만 비밀번호를 지정하지 않았습니다." +msgstr "선택된 서비스의 양파 주소(onion address)를 클립보드로 복사" msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "토르 설정 파일 선택" +msgstr "로컬 파일 시스템을 탐색하고 선택된 서비스의 디렉토리를 선택합니다." msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "파일을 찾지 못하였습니다." +msgstr "새로운 것" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" @@ -61,7 +61,7 @@ msgstr "%1 이/가 존재하지 않습니다. 새로 생성하시겠습니까?" msgctxt "AdvancedPage" msgid "Failed to Create File" -msgstr "파일 생성 실패" +msgstr "시도 중" msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" @@ -69,75 +69,76 @@ msgstr "%1 생성 실패 [2%]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "토르 데이터를 위한 폴더를 선택해주세요." +msgstr "Tor 서비스를 시작할 수 없었습니다." msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "토르 서비스 정지 실패" +msgstr "제어 비밀번호를 해시하지 못했습니다." msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "토르 서비스 설치 실패" +msgstr "UPnP를 사용한 올바른 인터넷 게이트웨이 장치를 찾을 수 없습니다" msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "비달리아가 토르 서비스를 설치 할 수 없었습니다." +msgstr "WSAStartup 실패" msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "인증:" +msgstr "포트 매핑 추가가 실패했습니다." msgctxt "AdvancedPage" msgid "Address:" -msgstr "주소:" +msgstr "포트 매핑을 검색하지 못했습니다." msgctxt "AdvancedPage" msgid "None" -msgstr "없음" +msgstr "매핑을 제거하는 것이 실패하였습니다." msgctxt "AdvancedPage" msgid "Cookie" -msgstr "쿠키" +msgstr "UPnP가 가능한 장치 찾기" msgctxt "AdvancedPage" msgid "Password" -msgstr "비밀번호" +msgstr "디렉토리 포트 메핑 업데이트 중" msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "무작위 생성" +msgstr "중계 포트 매핑 업데이트 중" msgctxt "AdvancedPage" msgid ":" -msgstr ":" +msgstr "테스트가 성공적으로 완료되었습니다!" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "토르 설정 파일" +msgstr "UPnP 지원 테스트" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "토르를 지정된 설정 파일로 실행 (torrc)" +msgstr "Universal Plug & Play 지원 테스트" msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "설정 파일의 경로를 선택하세요." +msgstr "Vidalia는 '%1' 를(을) 찾을 수 없기 때문에 가능한 소프트웨어 업데이트를 확인할 수 없습니다." msgctxt "AdvancedPage" msgid "Browse" -msgstr "찾기" +msgstr "" +"Vidalia는 Tor 업데이트 프로세스가 예상치 못하게 종료되었기 때문에 가능한 소프트웨어 업데이트를 확인할 수 없었습니다." msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "데이터 경로" +msgstr "가능한 업데이트 확인중..." msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "다음 디렉토리에있는 토르 소프트웨어 저장소 데이터" +msgstr "숨기기" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Tor 소프트웨어의 저장소 폴더를 지정하여 주세요." +msgstr "업데이트 다운로드 중...." msgctxt "AdvancedPage" msgid "Tor Control" @@ -204,85 +205,83 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "" -"Vidalia가 Tor 서비스를 제거하는데 실패하였습니다.\n" -"수동으로 삭제 하셔야 합니다." +msgstr "업데이트된 소프트웨어 설치 중...." msgctxt "AppearancePage" msgid "Language" -msgstr "언어" +msgstr "완료되었습니다! 귀하의 소프트웨어는 지원이 가능합니다." msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Vidalia에서 사용되는 언어를 선택하기" +msgstr "확인" msgctxt "AppearancePage" msgid "Style" -msgstr "스타일" +msgstr "소프트웨어 업데이트" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "Vidalia의 인터페이스 스타일을 선택하기" +msgstr "업데이트 확인 중..." msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." -msgstr "Vidalia가 해당 언어의 번역을 불러 들일수 없었습니다." +msgstr "취소" msgctxt "BandwidthGraph" msgid "Since:" -msgstr "이후 :" +msgstr "소프트웨어 업데이트 가능" msgctxt "BandwidthGraph" msgid "Hide Settings" -msgstr "설정 숨기기" +msgstr "나중에 알리기" msgctxt "BandwidthGraph" msgid "Show Settings" -msgstr "설정 보이기" +msgstr "설치" msgctxt "BandwidthGraph" msgid "Tor Bandwidth Usage" -msgstr "Tor 대역폭 상태" +msgstr "다음의 업데이트된 소프트웨어 패키지는 설치 준비가 완료되었습니다." msgctxt "BandwidthGraph" msgid "Reset" -msgstr "초기화" +msgstr "패키지" msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "수신률" +msgstr "버전" msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "전송률" +msgstr "확인" msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "항상 위로" +msgstr "취소" msgctxt "BandwidthGraph" msgid "Style" -msgstr "스타일" +msgstr "예" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "대역폭 그래프의 투명도 설정" +msgstr "아니오" msgctxt "BandwidthGraph" msgid "100" -msgstr "100" +msgstr "찾아보기" msgctxt "BandwidthGraph" msgid "% Opaque" -msgstr "% 투명화" +msgstr "잘못된 인수" msgctxt "BandwidthGraph" msgid "Save" -msgstr "저장" +msgstr "Vidalia는 이미 작동중입니다." msgctxt "BandwidthGraph" msgid "Cancel" -msgstr "취소" +msgstr "이 메시지를 보여주고 종료합니다." msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." @@ -3056,15 +3055,15 @@ msgstr "이것은 다른 사람에게 줄 수 있는 귀하의 브릿지 중계 msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard" -msgstr "" +msgstr "귀하의 중계 신원을 클립보드로 복사합니다." msgctxt "ServerPage" msgid "No Recent Usage" -msgstr "" +msgstr "최근 사용 없음" msgctxt "ServerPage" msgid "No clients have used your relay recently." -msgstr "" +msgstr "최근 귀하의 중계를 사용한 클라이언트가 없습니다." msgctxt "ServerPage" msgid "" @@ -3115,16 +3114,17 @@ msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." msgstr "" +"귀하의 중계에 대한 문제가 있을 경우 연락을 받을 수 있는 이메일 주소:귀하는 또한 PGP나 GPG 지문을 포함할 수도 있습니다." msgctxt "ServicePage" msgid "Error while trying to unpublish all services" -msgstr "" +msgstr "발행되지 않은 모든 서비스를 시도하는 중 오류" msgctxt "ServicePage" msgid "" "Please configure at least a service directory and a virtual port for each " "service you want to save. Remove the other ones." -msgstr "" +msgstr "저장을 원하는 각각의 서비스에 대하여 가상 포트 번호와 서비스 주소를 입력하여 주십시오. 다른 것을 제거해 주십시오." msgctxt "ServicePage" msgid "Error" @@ -3144,15 +3144,15 @@ msgstr "가상 포트 번호는 실제 포트 번호(1~65535) 내에 포함되 msgctxt "ServicePage" msgid "Target may only contain address:port, address, or port." -msgstr "" +msgstr "목표는 주소와 포트, 주소:포트만을 포함할 수 있습니다." msgctxt "ServicePage" msgid "Directory already in use by another service." -msgstr "" +msgstr "디렉토리가 이미 다른 서비스에서 사용중입니다." msgctxt "ServicePage" msgid "Form" -msgstr "" +msgstr "~로부터" msgctxt "ServicePage" msgid "Provided Hidden Services" @@ -3168,19 +3168,19 @@ msgstr "가상 포트" msgctxt "ServicePage" msgid "Target" -msgstr "" +msgstr "목표" msgctxt "ServicePage" msgid "Directory Path" -msgstr "" +msgstr "디렉토리 경로" msgctxt "ServicePage" msgid "Enabled" -msgstr "" +msgstr "허영" msgctxt "ServicePage" msgid "Add new service to list" -msgstr "" +msgstr "새로운 서비스를 목록에 추가" msgctxt "ServicePage" msgid "Remove selected service from list" @@ -3188,11 +3188,11 @@ msgstr "목록에서 선택된 서비스 제가" msgctxt "ServicePage" msgid "Copy onion address of selected service to clipboard" -msgstr "" +msgstr "선택된 서비스의 양파 주소(Onion address)를 클립보드로 복사" msgctxt "ServicePage" msgid "Browse in local file system and choose directory for selected service" -msgstr "" +msgstr "로컬 파일 시스템에서 탐색하고 선택된 서비스의 디렉토리를 선택합니다." msgctxt "ServicePage" msgid "Created by Tor" @@ -3445,11 +3445,11 @@ msgstr "" msgctxt "Stream" msgid "New" -msgstr "" +msgstr "새로운 것" msgctxt "Stream" msgid "Resolving" -msgstr "" +msgstr "풀기" msgctxt "Stream" msgid "Connecting" @@ -3469,11 +3469,11 @@ msgstr "닫기" msgctxt "Stream" msgid "Retrying" -msgstr "" +msgstr "시도" msgctxt "Stream" msgid "Remapped" -msgstr "" +msgstr "리매핑" msgctxt "Stream" msgid "Unknown" @@ -3489,11 +3489,11 @@ msgstr "Tor 서비스는 설치되지 않았습니다." msgctxt "TorService" msgid "Unable to start the Tor service." -msgstr "" +msgstr "Tor 서비스를 시작하지 못했습니다." msgctxt "TorSettings" msgid "Failed to hash the control password." -msgstr "" +msgstr "제어 비밀번호를 해시하지 못했습니다." msgctxt "TorrcDialog" msgid "Editing torrc" @@ -3567,23 +3567,23 @@ msgstr "UPnP가 허용된 장치가 없습니다." msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "" +msgstr "올바른 UPnP 인터넷 게이트웨이 장치를 찾지 못했습니다." msgctxt "UPNPControl" msgid "WSAStartup failed" -msgstr "" +msgstr "WSA 시작 실패" msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "" +msgstr "포트 매핑 추가를 실패하였습니다." msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "" +msgstr "포트 매핑을 찾는 것(retrieve)에 실패했습니다." msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "" +msgstr "포트 매핑을 제거를 실패했습니다." msgctxt "UPNPControl" msgid "Unknown error" @@ -3727,7 +3727,7 @@ msgstr "끝내기" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "탐색" msgctxt "Vidalia" msgid "Invalid Argument"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Jan '12

03 Jan '12

commit 1f6a52ae1508cd53c2914ad8f2df7eaf8bea9c05 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 3 11:45:14 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 381bf1b..139bb58 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,14 +1,14 @@ # # Translators: # <contact(a)imfast.kr>, 2011. -# <cwt967(a)naver.com>, 2011. +# <cwt967(a)naver.com>, 2011, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-11-20 02:35+0000\n" +"PO-Revision-Date: 2012-01-03 11:43+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2812,7 +2812,7 @@ msgstr "중계소" msgctxt "RouterListWidget" msgid "Zoom to Relay" -msgstr "" +msgstr "중계소 확대" msgctxt "RouterListWidget" msgid "%1 relays online" @@ -2860,7 +2860,7 @@ msgstr "클라이언트만 작동" msgctxt "ServerPage" msgid "Relay traffic for the Tor network" -msgstr "" +msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다." msgctxt "ServerPage" msgid "Relay Port:" @@ -2900,7 +2900,7 @@ msgstr "귀하의 중계 이름" msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" -msgstr "" +msgstr "사용자와 다른 중계소와 통신할 수 있는 포트" msgctxt "ServerPage" msgid "Nickname:" @@ -2914,7 +2914,7 @@ msgctxt "ServerPage" msgid "" "For Internet connections with fast download speed but slow upload, please " "list your upload speed here." -msgstr "" +msgstr "인터넷 다운로드 속도는 빠르지만 업로드 속도가 느릴 경우, 업로드 속도를 입력해 주십시오." msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" @@ -2942,11 +2942,11 @@ msgstr "사용자 설정" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" -msgstr "" +msgstr "귀하의 인터넷 연결과 가장 비슷한 연결을 선택하여 주십시오." msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" -msgstr "" +msgstr "대역폭 제한에 대한 도움말 보기" msgctxt "ServerPage" msgid "Average Rate" @@ -2966,7 +2966,7 @@ msgstr "최대 속도" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" -msgstr "" +msgstr "최고 대역폭 제한" msgctxt "ServerPage" msgid "" @@ -2996,7 +2996,7 @@ msgstr "매일 수신 (POP. IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" -msgstr "" +msgstr "체크박스에 없는 포트" msgctxt "ServerPage" msgid "Misc Other Services" @@ -3008,38 +3008,38 @@ msgstr "706 및 1863, 5050, 5190, 5222, 5223, 8300, 8888 포트" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "인스턴트 메시징 (IM)" msgctxt "ServerPage" msgid "Port 443" -msgstr "" +msgstr "포트번호 443" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "보안 연결된 웹사이트 (SSL)" msgctxt "ServerPage" msgid "Port 80" -msgstr "" +msgstr "포트번호 80" msgctxt "ServerPage" msgid "Websites" -msgstr "" +msgstr "일반적인 웹사이트" msgctxt "ServerPage" msgid "Show help topic on exit policies" -msgstr "" +msgstr "출구 정책에 대한 도움말 보기" msgctxt "ServerPage" msgid "" "What Internet resources should users be able to access from your relay?" -msgstr "" +msgstr "귀하의 중계를 통하여 사용자가 어떤 인터넷 자원에 접근할 수 있도록 하시겠습니까?" msgctxt "ServerPage" msgid "" "Tor will still block some outgoing mail and file sharing applications by " "default to reduce spam and other abuse." -msgstr "" +msgstr "Tor는 악용과 스팸 방지를 위하여, 몇몇 메일 보내기와 파일 공유를 제한합니다." msgctxt "ServerPage" msgid "Exit Policies" @@ -3047,12 +3047,12 @@ msgstr "출구 정책" msgctxt "ServerPage" msgid "Let others access your bridge by giving them this line:" -msgstr "" +msgstr "이 문자열을 다른 사람에게 줌으로써 그들이 귀하의 중계에 접근할 수 있도록 합니다." msgctxt "ServerPage" msgid "" "This is the identity of your bridge relay that you can give to other people" -msgstr "" +msgstr "이것은 다른 사람에게 줄 수 있는 귀하의 브릿지 중계의 신분입니다." msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard"

1 0

[stem/master] Remove awk and grep from ps call
by atagar＠torproject.org 03 Jan '12

03 Jan '12

commit c421b54e52d181e14a6677752fe2c07d2b56a796 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Dec 20 17:13:53 2011 +0530 Remove awk and grep from ps call Instead of piping the output from the ps call to grep and awk, use python itself to parse the result. --- test/integ/util/system.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 7f4c68c..b255c4a 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -26,11 +26,13 @@ class TestSystem(unittest.TestCase): if self.is_extra_tor_running == None: if not stem.util.system.is_bsd(): - pgrep_results = stem.util.system.call("pgrep -x tor") + pgrep_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PGREP % "tor") self.is_extra_tor_running = len(pgrep_results) > 1 else: - pgrep_results = stem.util.system.call("ps -axo pid,command,args | grep -i tor | awk '{ print $1}'") - self.is_extra_tor_running = len(pgrep_results) > 1 + ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) + results = [r for r in ps_results if r.endswith("tor")] + self.is_extra_tor_running = len(results) > 1 + def tearDown(self): # resets call mocking back to being disabled stem.util.system.CALL_MOCKING = None

1 0

[stem/master] Making integ test ps query just match 'tor'
by atagar＠torproject.org 03 Jan '12

03 Jan '12

commit 4cd8ac450fd0f3c80a74c4f7835bee1fd2644ef5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 2 20:39:50 2012 -0800 Making integ test ps query just match 'tor' The fix in c421b54 checked for endings of 'tor' rather than ' tor', causing things like 'monitor' to be picked up. --- test/integ/util/system.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index b255c4a..dc06351 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -30,7 +30,7 @@ class TestSystem(unittest.TestCase): self.is_extra_tor_running = len(pgrep_results) > 1 else: ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) - results = [r for r in ps_results if r.endswith("tor")] + results = [r for r in ps_results if r.endswith(" tor")] self.is_extra_tor_running = len(results) > 1 def tearDown(self):

1 0

[stem/master] Replace pgrep with ps in the BSD systems
by atagar＠torproject.org 03 Jan '12

03 Jan '12

commit 8c8ad75bd1e3dc5541273336b03d6300f689b66e Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Dec 19 22:23:41 2011 +0530 Replace pgrep with ps in the BSD systems Now, the integ test checks if the os is a BSD system with a call to stem.util.system.is_bsd(). If it is BSD, then it uses ps to check if an extra Tor instance is running, instead of using pgrep which does not exist on BSD. --- test/integ/util/system.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index d1e9f88..7f4c68c 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -25,9 +25,12 @@ class TestSystem(unittest.TestCase): # legitemately fail. if self.is_extra_tor_running == None: - pgrep_results = stem.util.system.call("pgrep -x tor") - self.is_extra_tor_running = len(pgrep_results) > 1 - + if not stem.util.system.is_bsd(): + pgrep_results = stem.util.system.call("pgrep -x tor") + self.is_extra_tor_running = len(pgrep_results) > 1 + else: + pgrep_results = stem.util.system.call("ps -axo pid,command,args | grep -i tor | awk '{ print $1}'") + self.is_extra_tor_running = len(pgrep_results) > 1 def tearDown(self): # resets call mocking back to being disabled stem.util.system.CALL_MOCKING = None

1 0

[stem/master] Dropping get_system_tor_version() usage from tests
by atagar＠torproject.org 03 Jan '12

03 Jan '12

commit 29652d978ce7465f288575061c819e77a7e67013 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 2 16:42:14 2012 -0800 Dropping get_system_tor_version() usage from tests At one point our integ tests was using the get_system_tor_version() function to determine our test instance's version. This is fine for now since we run against whatever tor binary is first in our path, but in the future tor devs will want to be able to select the binary so that won't work. Adding a test runner method for querying our version from tor instead. --- test/integ/socket/control_message.py | 13 ++++--------- test/runner.py | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index b939c87..90ac623 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -120,16 +120,12 @@ class TestControlMessage(unittest.TestCase): Parses the 'GETINFO config-text' response. """ + runner = test.runner.get_runner() req_version = stem.version.Requirement.GETINFO_CONFIG_TEXT + our_version = runner.get_tor_version() - try: - if stem.version.get_system_tor_version() < req_version: - self.skipTest("(requires %s)" % req_version) - except IOError: - # This is a best-effot lookup to avoid showing a valid failure. If the - # version lookup fails then running the test. - - pass + if our_version and our_version < req_version: + self.skipTest("(requires %s)" % req_version) # We can't be certain of the order, and there may be extra config-text # entries as per... @@ -137,7 +133,6 @@ class TestControlMessage(unittest.TestCase): # # so we'll just check that the response is a superset of our config - runner = test.runner.get_runner() torrc_contents = [] for line in runner.get_torrc_contents().split("\n"): diff --git a/test/runner.py b/test/runner.py index ed92126..581f95a 100644 --- a/test/runner.py +++ b/test/runner.py @@ -15,7 +15,8 @@ Runner - Runtime context for our integration tests. |- get_torrc_contents - contents of our tor instance's torrc |- get_connection_type - method by which controllers can connect to tor |- get_pid - process id of our tor process - +- get_tor_socket - provides a socket to the tor instance + |- get_tor_socket - provides a socket to the tor instance + +- get_tor_version - provides the version of tor we're running against """ import os @@ -30,6 +31,7 @@ import threading import stem.socket import stem.process +import stem.version import stem.util.conf import stem.util.enum import stem.util.term as term @@ -365,6 +367,28 @@ class Runner: return control_socket + def get_tor_version(self): + """ + Queries our test instance for tor's version. + + Returns: + stem.version.Version for our test instance, None if we're unable to + connect to it + """ + + # TODO: replace with higher level functions when we've completed a basic + # controller class + + control_socket = self.get_tor_socket() + if not control_socket: return None + + control_socket.send("GETINFO version") + version_response = control_socket.recv() + control_socket.close() + + tor_version = list(version_response)[0][8:] + return stem.version.Version(tor_version) + def _get(self, attr): """ Fetches one of our attributes in a thread safe manner, raising if we aren't

1 0