Menu
▾
▴
stp-svn — Subversion Commit Notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(9) |
May
(20) |
Jun
(7) |
Jul
(30) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(4) |
Feb
(7) |
Mar
(10) |
Apr
(1) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
(4) |
Apr
(3) |
May
(2) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(2) |
Jun
(2) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: 请转相关人员 <fn...@rj...> - 2012-07-28 13:06:01
|
国际商务谈判策略与涉外销售沟通技巧
时间地点：2012年8月18-19日 上 海
时间地点：2012年8月25-26日 深 圳
收 费：2800 /人（包括资料费、午餐及上下午茶点等）
对 象：外贸企业、出口生产型企业、私营公司老板、外贸SOHO等涉外领域高层、进出口部主管、业务人员等
咨询电话：020-80560638 020-85917945 谢小姐
0755-61287552 021-51602856 （不需要此类信件请回复电邮至tui...@12...退信）
----------------------------------------------------------------------------------
涉外销售策略的本质实际上就是涉外商务沟通的过程，对于我国目前的外贸业务，重点仍然是依
赖于外销人员的推广，因此，外销人员的涉外谈判技能和销售沟通技巧就成为外销业务成败的关键。
而对外沟通，就必须考虑到从国别特征到经销层级的各个方面；再者，沟通是人与人的交往，而这种
交往就不能只局限于商务领域。从商务领域出发的涉外商务沟通不得不牵涉到心与心的沟通以及相互
的影响和尊重。
=======================================================================================
一、涉外商务谈判的PLAM模式与销售谈判人员管理
A、海外销售与国内销售的异同分析
B、PLAM模式
1、PLAN
2、RELATIONSHIP
3、AGREEMENT
4、MAINTENANCE
C、涉外销售谈判人员管理
二、国际商务谈判注意事项
1、国际商务谈判与定价权
2、国际商务谈判中的团队协作
3、国际商务谈判中的跟单与流程管理
4、国际商务谈判中的系统管理
5、国际商务谈判中的客户认同与激励措施
6、影响到国际商务谈判中的六大要素
三、涉外销售谈判中的国别特征分析及相应的策略应对
A、客户的国别与区域特征对涉外销售的影响
B、重点区域提点及推广经验畅谈与概括
C、如何展开与不同区域特征的客户的销售推广
四、海外客户的经销层级及其应对策略
A、海外客户的经销层级分析
B、直接客户与终端用户
C、工程商与机构采购商
D、采购商与招标商
E、品牌商与OEM客户
F、从OEM到OMM
五、涉外商务沟通中的战略思想与沟通技巧
1、涉外商务沟通的战略要点一------关注点碰撞
2、涉外商务沟通的战略要点二------思维一致性
3、涉外商务沟通的战略要点三------过程、氛围与节奏
4、涉外商务沟通的战略要点四------一揽子谈判与多方案
5、涉外商务沟通的战略要点五------利益与立场
6、涉外商务沟通的战略要点六------谈判方式的合理选择
7、欧式思维与欧式谈判
8、美式思维与美式谈判
9、日式思维与日式谈判
10、华裔思维
11、贸易代表的特征解析与沟通要点
六、国际商务谈判与沟通的阶段性策略
1、开价的五大技巧
2、了解并改变对方底价
1)打探和测算对方底价
2)影响对方底价的三大因素
3)改变对方底价的策略
4)预估合理的成交点
3、开局
1)谈判气氛
2)谈判进程、目标、计划
3)开场陈述
4)分析开局阶段应考虑的各种因素
4、沟通与讨价还价
1)先后次序和多方案或者一揽子
2)行情和原则
3)明确底线
4)欧洲式沟通
5)日本式沟通
6)中国的中庸式沟通在国际贸易谈判中的利弊
7)美国式沟通
8)海外华侨的沟通方式
9)与贸易代表的沟通方式
10)沟通应遵循的原则
5、磋商
1)充分准备
2)是否让步
6、成交
1)场外交易
2)最后让步或得寸进尺
3)不忘最后得利
4)强调双方的共同成功
5)慎重对待协议结果
5、事后管理与督促
1)客户跟单策略
2)客户跟单中的沟通技巧
3)邮件、传真与电话在跟单中的不同作用和使用技巧
七、涉外销售中的妥协与让步
1、5W+1H
1）为什么让步
2）谁应让步？应对谁让步？
3）在何处让步？让步的幅度？
4）什么时间让步？
5）让步的内容有哪些？什么可以让？什么不可以让？是否需要对方作出相应的表态？
6）怎样让步？节奏如何？
2、是否让步
3、八种让步方式对比
4、让步策略
5、迫使对方让步的策略
6、阻止对方的策略
八、涨价谈判策略
1、涨价前的准备工作
2、营造涨价谈判的前期氛围
3、涨价预警与涨价心理预期
4、涨价谈判的六大要点
5、涨价谈判前的双方实力评估和SWOT分析
6、涨价的五步计划与策略
7、涨价谈判中的产品、沟通与客户策略
8、涨价谈判的团队工作与团队策略
9、涨价谈判中的支持体系建设（渠道、融资、终端）
九、涉外销售跟进与海外客户的深度沟通
1、涉外销售跟进的方式分析
2、跟进就是谈判------客户是跟出来的，订单是追出来的
3、海外销售日志与涉外销售的表格化管理
4、涉外客户管理的五个业务层次
5、你是客户的供应商还是客户的商业顾问？
6、海外客户的深度沟通
十、销售方式选择与沟通策略
1、交易会模式下的客户沟通策略
2、电子商务模式下的客户沟通策略
3、其他模式下的客户沟通策略
十一、国际商务礼仪对商务谈判成败的影响
=======================================================================================
陈硕老师，双硕士(美国马里兰大学MBA、南开大学经济学硕士)，省外经贸厅贸易顾问，香港国际
经济管理学院客座教授，香港贸易促进会会员，《粤港中小企业贸易论坛》主讲人之一，曾任世界
５００强的中国粮油食品进出口集团公司进出口六部部长，中粮集团驻香港、加拿大商务主办，惠尔
普(美)上海有限公司南区经理和运营总监、深圳某著名商务咨询有限公司总经理、香港IBT国际商务
咨询有限公司国 际贸 易首席咨询师，东京丸一综合商社西北区市场总监、珠海威玛石油设备进出口
公司总经理，多年来先后在上海、北京、山东、浙江、江苏、四川等地举行了６００多场国际贸易专
题讲座，为近百家企业做过专门内 训或顾 问服务，受到企业和学员的广泛好评，陈先生具有极深厚
的理论知识和实践经验，是典型的实战派讲师，２０多年的外贸业务管理经验，特别在处理外贸业务
疑难问题方面有独到的见解和技巧，具有娴熟的业务技能和极佳的语言表达能力，对国际贸易术语有
极精确的理解，同时陈先生还将传授很多创造性、边缘性的操作手法与心得同大家交流和分享，每次
都令学员意犹未尽，茅塞顿开。
|
|
From: <jud...@us...> - 2006-09-06 19:19:23
|
Revision: 332
http://svn.sourceforge.net/stp/?rev=332&view=rev
Author: judith_osdl
Date: 2006-09-06 12:19:19 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
Fix the syntax.
Modified Paths:
--------------
trunk/Test-Sut/scripts/client/stp_include.sh
Modified: trunk/Test-Sut/scripts/client/stp_include.sh
===================================================================
--- trunk/Test-Sut/scripts/client/stp_include.sh 2006-08-25 17:42:31 UTC (rev 331)
+++ trunk/Test-Sut/scripts/client/stp_include.sh 2006-09-06 19:19:19 UTC (rev 332)
@@ -114,7 +114,7 @@
done
cp $TEST_LOGS/run-log.txt $TEST_LOGS/run-log.${COUNT}.txt
logger -t STP Test requested reboot
- boottool --boot-once STP
+ boottool --title=STP --boot-once
reboot
sleep 5m
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jud...@us...> - 2006-08-25 17:42:43
|
Revision: 331 Author: judith_osdl Date: 2006-08-25 10:42:31 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=331&view=rev Log Message: ----------- Make reboot function work to boot correct kernel. Modified Paths: -------------- trunk/Test-Sut/scripts/client/stp_include.sh Modified: trunk/Test-Sut/scripts/client/stp_include.sh =================================================================== --- trunk/Test-Sut/scripts/client/stp_include.sh 2006-07-31 17:47:27 UTC (rev 330) +++ trunk/Test-Sut/scripts/client/stp_include.sh 2006-08-25 17:42:31 UTC (rev 331) @@ -114,6 +114,7 @@ done cp $TEST_LOGS/run-log.txt $TEST_LOGS/run-log.${COUNT}.txt logger -t STP Test requested reboot + boottool --boot-once STP reboot sleep 5m } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-31 17:47:31
|
Revision: 330 Author: judith_osdl Date: 2006-07-31 10:47:27 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=330&view=rev Log Message: ----------- Add a space to fix these kernel arguments. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-28 22:51:49 UTC (rev 329) +++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-31 17:47:27 UTC (rev 330) @@ -153,7 +153,7 @@ $bootloader_hash{'root'} = $myroot; } if ( $myargs ){ - $bootloader_hash{'args'} .= $myargs; + $bootloader_hash{'args'} .= ' ' . $myargs; } if ( -f '/boot/initrd-STP.img' ){ $bootloader_hash{'initrd'} = '/boot/initrd-STP.img'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-28 22:51:57
|
Revision: 329 Author: judith_osdl Date: 2006-07-28 15:51:49 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=329&view=rev Log Message: ----------- Fix the initrd and other hash settings. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-28 20:39:03 UTC (rev 328) +++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-28 22:51:49 UTC (rev 329) @@ -150,13 +150,13 @@ 'boot-once' => 1 ); if ( $myroot ){ - $bootloader_hash->{'root'} = $myroot; + $bootloader_hash{'root'} = $myroot; } if ( $myargs ){ - $bootloader_hash->{'args'} .= $myargs; + $bootloader_hash{'args'} .= $myargs; } if ( -f '/boot/initrd-STP.img' ){ - $bootloader_hash->{'initrd'} = '/boot/initrd-STP.img'; + $bootloader_hash{'initrd'} = '/boot/initrd-STP.img'; } # force the kernel to be added just in case we need to overwrite an old one This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-28 20:39:24
|
Revision: 328 Author: judith_osdl Date: 2006-07-28 13:39:03 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=328&view=rev Log Message: ----------- use 'software_type', not 'type' here as well. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload.pm 2006-07-25 19:34:00 UTC (rev 327) +++ trunk/Test-Sut/lib/Test/Sut/Upload.pm 2006-07-28 20:39:03 UTC (rev 328) @@ -192,8 +192,8 @@ $txt .= "\tADDITIONAL PACKAGES\n"; for ( my $i = 1; $i <= $#{ $soft_ref }; $i++ ) { my $package_ref = - $r->getSoftwareInfo( $soft_ref->[ $i ]->{ 'type' } ); - $txt .= "\tPackage type: $soft_ref->[ $i ]->{ 'type' }\n"; + $r->getSoftwareInfo( $soft_ref->[ $i ]->{ 'software_type' } ); + $txt .= "\tPackage type: $soft_ref->[ $i ]->{ 'software_type' }\n"; $txt .= "\tPLM ID: $package_ref->[ 0 ]\n"; $txt .= "\tPackage name: $package_ref->[ 1 ]\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-28 19:39:51
|
Revision: 327 Author: judith_osdl Date: 2006-07-25 12:34:00 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=327&view=rev Log Message: ----------- Fix Notes. Modified Paths: -------------- trunk/Test-Sut/Changes trunk/Test-Sut/tags/0.0.7 Modified: trunk/Test-Sut/Changes =================================================================== --- trunk/Test-Sut/Changes 2006-07-25 19:31:07 UTC (rev 326) +++ trunk/Test-Sut/Changes 2006-07-25 19:34:00 UTC (rev 327) @@ -5,3 +5,4 @@ Also, It allow mail-in for the Single test mode (OSDL's kautotest), because, frankly, the SOAP upload fails if file is too big and often fails to unpack resuls. The Receiving sscript for the mail-in is tested and has a default_sender option. +Also fix additional software 'type' to 'software_type'. Modified: trunk/Test-Sut/tags/0.0.7 =================================================================== --- trunk/Test-Sut/tags/0.0.7 2006-07-25 19:31:07 UTC (rev 326) +++ trunk/Test-Sut/tags/0.0.7 2006-07-25 19:34:00 UTC (rev 327) @@ -1 +1 @@ -325 +327 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-26 16:32:00
|
Revision: 326 Author: judith_osdl Date: 2006-07-25 12:31:07 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=326&view=rev Log Message: ----------- Fix 'type' to 'software_type'. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upgrade/Plm.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upgrade/Plm.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upgrade/Plm.pm 2006-07-24 22:58:09 UTC (rev 325) +++ trunk/Test-Sut/lib/Test/Sut/Upgrade/Plm.pm 2006-07-25 19:31:07 UTC (rev 326) @@ -52,8 +52,8 @@ $self->set_test_request_status( "Adding Additional Software" ); for ( my $i = 1; $i <= $#{ $soft_ref }; $i++ ) { my $package_ref = get_software_info( $soft_ref, - $soft_ref->[ $i ]->{ 'type' } ); - $pack_type = $soft_ref->[ $i ]->{ 'type' }; + $soft_ref->[ $i ]->{ 'software_type' } ); + $pack_type = $soft_ref->[ $i ]->{ 'software_type' }; $pack_tag = $package_ref->[ 0 ]; $pack_name = $package_ref->[ 1 ]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-24 22:58:13
|
Revision: 325 Author: judith_osdl Date: 2006-07-24 15:58:09 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=325&view=rev Log Message: ----------- Add a version to release note. Added Paths: ----------- trunk/Test-Sut/tags/0.0.7 Added: trunk/Test-Sut/tags/0.0.7 =================================================================== --- trunk/Test-Sut/tags/0.0.7 (rev 0) +++ trunk/Test-Sut/tags/0.0.7 2006-07-24 22:58:09 UTC (rev 325) @@ -0,0 +1 @@ +325 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-24 22:57:23
|
Revision: 324 Author: judith_osdl Date: 2006-07-24 15:57:16 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=324&view=rev Log Message: ----------- Add release notes. Modified Paths: -------------- trunk/Test-Sut/Changes Modified: trunk/Test-Sut/Changes =================================================================== --- trunk/Test-Sut/Changes 2006-07-21 22:00:24 UTC (rev 323) +++ trunk/Test-Sut/Changes 2006-07-24 22:57:16 UTC (rev 324) @@ -1,2 +1,7 @@ Version 0.01 new release +Version 0.0.7 +This release is updated to boot either grub or lilo (x86, x86_64) +Also, It allow mail-in for the Single test mode (OSDL's kautotest), because, frankly, +the SOAP upload fails if file is too big and often fails to unpack resuls. +The Receiving sscript for the mail-in is tested and has a default_sender option. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-21 22:00:27
|
Revision: 323 Author: judith_osdl Date: 2006-07-21 15:00:24 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=323&view=rev Log Message: ----------- The detectbootloader call is NOT OO. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-21 21:12:00 UTC (rev 322) +++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-21 22:00:24 UTC (rev 323) @@ -189,7 +189,7 @@ ); # use Linux::Bootloader to set boot once for the STP kernel - my $detected_bootloader = Linux::Bootloader::Detect->detect_bootloader(); + my $detected_bootloader = Linux::Bootloader::Detect::detect_bootloader(); if ( ! $detected_bootloader ){ $detected_bootloader='grub'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-21 21:12:02
|
Revision: 322 Author: judith_osdl Date: 2006-07-21 14:12:00 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=322&view=rev Log Message: ----------- This is a little hack for gentoo for now until I get the initrd working. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-21 17:46:02 UTC (rev 321) +++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm 2006-07-21 21:12:00 UTC (rev 322) @@ -58,7 +58,9 @@ $res = 0 unless ( -f "linux/System.map" and -f "linux/arch/$arch/boot/bzImage" ); unless ($self->kernel_version()){ $self->{'_ERR'}='compile_kernel'; return 0; } - system "mkinitrd -v -f /boot/initrd-STP.img $self->{'kernel_version'} &> $ENV{ 'SYSTEM_LOGS' }/mkinitrd.txt"; + unless ( -f '/etc/gentoo-release' ){ + system "mkinitrd -v -f /boot/initrd-STP.img $self->{'kernel_version'} &> $ENV{ 'SYSTEM_LOGS' }/mkinitrd.txt"; + } # We are done if there were no errors return 1 if ( $res ); @@ -141,7 +143,6 @@ # set up the hash to be passed to the add() function my %bootloader_hash = ( 'force' => 1, 'add-kernel' => '/boot/vmlinuz-STP', - 'initrd' => '/boot/initrd-STP.img', 'title' => 'STP', 'args' => $boot_opts, 'savedefault' => $default, @@ -154,6 +155,9 @@ if ( $myargs ){ $bootloader_hash->{'args'} .= $myargs; } + if ( -f '/boot/initrd-STP.img' ){ + $bootloader_hash->{'initrd'} = '/boot/initrd-STP.img'; + } # force the kernel to be added just in case we need to overwrite an old one $bootloader->add( %bootloader_hash ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-21 17:46:07
|
Revision: 321 Author: judith_osdl Date: 2006-07-21 10:46:02 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=321&view=rev Log Message: ----------- Fix reference name. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-21 17:42:24 UTC (rev 320) +++ trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-21 17:46:02 UTC (rev 321) @@ -69,7 +69,7 @@ $syslog->tail({'number_hours' => '6', 'output_file' => './logs/syslog.txt'}); system "chmod 644 ./logs/syslog.txt"; my $state = 'Completed'; - if ( $self->{'sub_test_failure'} != 0 ){ + if ( $r->{'sub_test_failure'} != 0 ){ $state = 'Failed'; } `echo $state > "$ENV{'SYSTEM_LOGS'}/test_request_status.txt"`; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-21 17:42:26
|
Revision: 320 Author: judith_osdl Date: 2006-07-21 10:42:24 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=320&view=rev Log Message: ----------- Need to create state file here, before packing up. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-21 17:26:44 UTC (rev 319) +++ trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-21 17:42:24 UTC (rev 320) @@ -68,6 +68,11 @@ my $syslog = new Sys::SyslogMessages(); $syslog->tail({'number_hours' => '6', 'output_file' => './logs/syslog.txt'}); system "chmod 644 ./logs/syslog.txt"; + my $state = 'Completed'; + if ( $self->{'sub_test_failure'} != 0 ){ + $state = 'Failed'; + } + `echo $state > "$ENV{'SYSTEM_LOGS'}/test_request_status.txt"`; # Move the test results to the current directory & archive them chdir( "$ENV{'EXEC_HOME'}" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-21 17:26:47
|
Revision: 319 Author: judith_osdl Date: 2006-07-21 10:26:44 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=319&view=rev Log Message: ----------- Fix the `uptime` parsing. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 21:49:52 UTC (rev 318) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-21 17:26:44 UTC (rev 319) @@ -156,10 +156,12 @@ $size -= 5000000; } - my $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; + my $load = `uptime`; + $load =~ s/^.*load average: (.*?), .*/$1/; while ( $load > 10 ){ sleep 30; - $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; + $load = `uptime`; + $load =~ s/^.*load average: (.*?), .*/$1/; } if ( ! $msg->send() ){ $self->mail_user( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-20 21:49:54
|
Revision: 318 Author: judith_osdl Date: 2006-07-20 14:49:52 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=318&view=rev Log Message: ----------- Fix the setTestRequest call arguments. Needed login, password and fixed order. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Admin/Result.pm Modified: trunk/Test-Sut/lib/Test/Admin/Result.pm =================================================================== --- trunk/Test-Sut/lib/Test/Admin/Result.pm 2006-07-20 21:29:10 UTC (rev 317) +++ trunk/Test-Sut/lib/Test/Admin/Result.pm 2006-07-20 21:49:52 UTC (rev 318) @@ -57,6 +57,8 @@ $self->{'log'} = new Test::Sut::Util::Log( $self->{ 'config' }->getConfigParam( 'log_filename' ), $self->{ 'config' }->getConfigParam( 'log_level' ) ); # Use Secured RPC, second option is a '1'. $self->{'asp_proxy'} = $self->{'config'}->getConfigParam( 'asp_proxy' ); + $self->{'asp_login'} = $self->{'config'}->getConfigParam( 'asp_login' ); + $self->{'asp_pass'} = $self->{'config'}->getConfigParam( 'asp_pass' ); $self->{'resultpath'} = $self->{'config'}->getConfigParam( 'resultpath' ); $self->{'default_sender'} = $self->{'config'}->getConfigParam( 'default_sender' ); $self->{'rpc'} = new Test::Transport::Wsdl( $self->{'asp_proxy'}, 1 ); @@ -197,7 +199,7 @@ close FH; } # Update test_request_status - $self->{'rpc'}->doASPAction( 'SetTestRequestStatus', $self->{ 'test_request_status' }, $self->{ 'test_request_id' } ); + $self->{'rpc'}->doASPAction( 'SetTestRequestStatus', $self->{ 'asp_login' }, $self->{ 'asp_pass' }, $self->{ 'test_request_id' }, $self->{ 'test_request_status' } ); if ( $self->{ 'test_request_status' } =~ m/Failed/i ){ $self->{ 'integration_status' } = 0; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-20 21:29:13
|
Revision: 317 Author: judith_osdl Date: 2006-07-20 14:29:10 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=317&view=rev Log Message: ----------- Need to update the lod average. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 20:45:57 UTC (rev 316) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 21:29:10 UTC (rev 317) @@ -159,6 +159,7 @@ my $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; while ( $load > 10 ){ sleep 30; + $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; } if ( ! $msg->send() ){ $self->mail_user( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-20 20:46:03
|
Revision: 316 Author: judith_osdl Date: 2006-07-20 13:45:57 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=316&view=rev Log Message: ----------- Add a check for load before sending mail. Do not set status from client. We want that to happen fromthe receiving result end. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm trunk/Test-Sut/lib/Test/Sut/Util/Log.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 19:49:36 UTC (rev 315) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 20:45:57 UTC (rev 316) @@ -42,12 +42,12 @@ sub upload_all { my ( $self ) = @_; + my $state='Completed'; if ( $self->{'sub_test_failure'} != 0 ){ - $self->set_test_request_status( "Failed" ); - } else { - $self->set_test_request_status( "Completed" ); - } + $state='Failed'; + } + `echo $state > "$ENV{'SYSTEM_LOGS'}/test_request_status.txt"`; # tar/bzip up results chdir $ENV{'RESULTS_ROOT'}; system "tar cvfj $ENV{'TEST_ID'}.tar.bz2 $ENV{'TEST_ID'}"; @@ -60,6 +60,8 @@ if ( $send_flag =~ m/yes|auto/i ){ $self->send_results(); } + # Only set state locally, because email receiving end will update database + #$self->set_test_request_status( $state ); chdir( $ENV{'EXEC_HOME'} ); return; @@ -153,7 +155,11 @@ sleep 2; $size -= 5000000; } - + + my $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; + while ( $load > 10 ){ + sleep 30; + } if ( ! $msg->send() ){ $self->mail_user( " File Send Failure ($file)", Modified: trunk/Test-Sut/lib/Test/Sut/Util/Log.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-20 19:49:36 UTC (rev 315) +++ trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-20 20:45:57 UTC (rev 316) @@ -71,7 +71,7 @@ sub msg{ my ( $self, $level, $message ) = @_; - if ( $level >= $self->{ 'level' }){ + if ( $level <= $self->{ 'level' }){ $self->log($message); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-20 19:49:42
|
Revision: 315 Author: judith_osdl Date: 2006-07-20 12:49:36 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=315&view=rev Log Message: ----------- Use sub_test_failure instead of ret Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Test/Single.pm Modified: trunk/Test-Sut/lib/Test/Sut/Test/Single.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Test/Single.pm 2006-07-20 17:54:59 UTC (rev 314) +++ trunk/Test-Sut/lib/Test/Sut/Test/Single.pm 2006-07-20 19:49:36 UTC (rev 315) @@ -32,6 +32,7 @@ sub run_test { my ( $self ) = @_; + $self->{'sub_test_failure'} = 0; $self->set_test_request_status( "Running" ); my $webpath = $self->getConfigParam( 'webpath' ); @@ -52,7 +53,6 @@ my $script_param = $self->{ 'tr_ref' }->{ 'test_params' } || ""; mkdir $ENV{'RESULTS'}; - my $ret = 0; makeEnvFile( $self, $self->{ 'environment' } ); chdir $test; chmod 0755, "wrap.sh"; @@ -66,13 +66,13 @@ `ls -lR`; system "echo $script_param > $ENV{'SYSTEM_LOGS'}/script_params.txt"; system ". $ENV{'TEST_ENV'}; . /usr/bin/stp_include.sh && ./wrap.sh $script_param &> $ENV{'SYSTEM_LOGS'}/run-log.txt"; - $ret = -1 unless ( $? == 0 ); + $self->{ 'sub_test_failure' } = -1 unless ( $? == 0 ); system "stp_oprofile stop"; system "stp_profile stop"; chdir ".."; - return $ret; + return $self->{ 'sub_test_failure' }; } sub generate_index { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-20 17:55:21
|
Revision: 314 Author: judith_osdl Date: 2006-07-20 10:54:59 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=314&view=rev Log Message: ----------- Updates for receiving email via brt_egate.pl Modified Paths: -------------- trunk/Test-Sut/lib/Test/Admin/Result.pm trunk/Test-Sut/lib/Test/Sut/Util/Log.pm trunk/Test-Sut/scripts/admin/brt_egate.pl Added Paths: ----------- trunk/Test-Sut/etc/stp_email.conf trunk/Test-Sut/etc/stp_receive_email.conf trunk/Test-Sut/tags/ Added: trunk/Test-Sut/etc/stp_email.conf =================================================================== --- trunk/Test-Sut/etc/stp_email.conf (rev 0) +++ trunk/Test-Sut/etc/stp_email.conf 2006-07-20 17:54:59 UTC (rev 314) @@ -0,0 +1,49 @@ +# Configuration file for the Scalable Test Platform +# +# 2004-2006 OSDL +# +# This is connfiguration for the autotest with wsdl transport +# Basic Information - STP PATH and administrator email +basepath: /usr/share/stp +admin_email: stp...@li... +support_email: stp...@li... + +# Set default urls to pull kernel source from using single spaces to deliminate +kernel_url: http://www.kernel.org/ http://www.au.kernel.org/ +kernel_path: pub/linux/kernel/v2.6/ pub/linux/kernel/v2.4/ +kernel_depth: 0 + +# Service location (ASP ) +asp_proxy: https://stp.testing.osdl.org/backend/service.wsdl +webpath: http://www.testing.osdl.org/tests/ + +# Global Logging Config +log_level: 2 +log_target: file +log_filename: "/var/log/stp/stp.log" + +# Data path for STP reports +datapath: /tmp/report + +# Result storage paths +resultpath: /home/stp/results +resulturl: http://www.testing.osdl.org/stp + +# Location of tools needed by stp_client.pl +use_local_state: no +state_file: /var/log/sut-state +plm_patch: /usr/bin/plm_build_tree.pl +plm_app: /usr/bin/plm_build_app.pl +kernel_build: stp_robokern +use_local_state: no +state_file: /var/log/sut-state +email_to: re...@st... +email_from: na...@te... +encrypt_results: yes +pub_key_id: 757E3417 +private_key_id: <private_key> +email_results: auto + + +net_health_check: "ping -w 10 -q -n -c1 10.11.59.1" + Added: trunk/Test-Sut/etc/stp_receive_email.conf =================================================================== --- trunk/Test-Sut/etc/stp_receive_email.conf (rev 0) +++ trunk/Test-Sut/etc/stp_receive_email.conf 2006-07-20 17:54:59 UTC (rev 314) @@ -0,0 +1,36 @@ +# Configuration file for the Scalable Test Platform +# +# 2004-2006 OSDL +# +# This is connfiguration for the autotest with wsdl transport +# Basic Information - STP PATH and administrator email +admin_email: stp...@li... +support_email: stp...@li... + +# Service location (ASP ) +asp_proxy: https://stp.testing.osdl.org/backend/service.wsdl +asp_login: test_unpacker +asp_pass: <password> + +# Global Logging Config +log_level: 2 +log_target: file +log_filename: "/var/log/stp/stp.log" + +# Data path for STP reports +datapath: /tmp/report + +# Result storage paths +resultpath: /srv/stp/results +#resulturl: http://www.testing.osdl.org/stp +default_sender: re...@st... + +# Location of tools needed by stp_client.pl +#plm_patch: /usr/bin/plm_build_tree.pl +#plm_app: /usr/bin/plm_build_app.pl +#kernel_build: stp_robokern +#use_local_state: no +#state_file: /var/log/sut-state + +#net_health_check: "ping -w 10 -q -n -c1 10.11.59.1" + Modified: trunk/Test-Sut/lib/Test/Admin/Result.pm =================================================================== --- trunk/Test-Sut/lib/Test/Admin/Result.pm 2006-07-19 21:27:29 UTC (rev 313) +++ trunk/Test-Sut/lib/Test/Admin/Result.pm 2006-07-20 17:54:59 UTC (rev 314) @@ -54,7 +54,7 @@ $self->{'configfile'} = $configfile; $self->{'config'} = new Test::Sut::Util::Config( $configfile ); - $self->{'log'} = new Test::Sut::Util::Log( $self->{ 'config' } ); + $self->{'log'} = new Test::Sut::Util::Log( $self->{ 'config' }->getConfigParam( 'log_filename' ), $self->{ 'config' }->getConfigParam( 'log_level' ) ); # Use Secured RPC, second option is a '1'. $self->{'asp_proxy'} = $self->{'config'}->getConfigParam( 'asp_proxy' ); $self->{'resultpath'} = $self->{'config'}->getConfigParam( 'resultpath' ); @@ -78,7 +78,9 @@ $self->{ 'test_request_id' } = $self->parse_header( $message->head() ); if ( $self->{ 'test_request_id' } ){ - ( $self->{'user_id'}, $self->{'user_email'}, $self->{'gpg_pubkey'} ) = @{ $self->get_sender_info() }; + my $user_information = $self->get_sender_info(); + $self->{'user_email'}=$user_information->{'email'}; + $self->{'gpg_pubkey'}=$user_information->{'gpg_pubkey'}; $self->{'filename'} = $self->{'resultpath'} . "/" . $self->{ 'test_request_id' } . ".tar.bz2.asc"; # This could be very big open FH, ">" . $self->{'filename'}; @@ -134,11 +136,13 @@ my ( $signee ) = $output =~ m/Good signature from \"(.*)\"/; if ( $signee =~ m/$self->{ 'user_email' }|$self->{'default_sender'}/ ){ - $self->{ 'log' }->msg( 4, "File " . $self->{ 'filename' } . " is signed.\nExpected: $self->{ 'user_email' }\nGot $output." ); + print "File " . $self->{ 'filename' } . " IS signed.\nExpected: $self->{ 'user_email' } or $self->{'default_sender'}\nGot $signee\n Error message: $output." ; + $self->{ 'log' }->msg( 4, "File " . $self->{ 'filename' } . " is signed.\nExpected: $self->{ 'user_email' } or $self->{'default_sender'}\nGot $signee\n Error message: $output." ); $self->{ 'filename' } = $outfile; return 1; } else { - $self->{ 'log' }->msg( 1, "File " . $self->{ 'filename' } . " is not signed.\nExpected: $self->{ 'user_email' }\nGot $output." ); + print "File " . $self->{ 'filename' } . " is NOT signed.\nExpected: $self->{ 'user_email' } or $self->{'default_sender'}\nGot $signee\n Error message: $output." ; + $self->{ 'log' }->msg( 1, "File " . $self->{ 'filename' } . " is NOT signed.\nExpected: $self->{ 'user_email' }or $self->{'default_sender'}\nGot $signee\n Error message: $output." ); return 0; } } Modified: trunk/Test-Sut/lib/Test/Sut/Util/Log.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-19 21:27:29 UTC (rev 313) +++ trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-20 17:54:59 UTC (rev 314) @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -package Tets::Sut::Util::Log; +package Test::Sut::Util::Log; # TODO __- Investigate Data::Dumper for Log::bomb use Data::Dumper; @@ -33,12 +33,16 @@ =cut sub new { - my ( $pkg, $logfile ) = @_; + my ( $pkg, $logfile, $level ) = @_; if ( !defined( $logfile ) ) { $logfile = "/var/log/FIX_STP_LOGFILE"; } - my $obj = { logfile => $logfile }; + if ( !defined( $level ) ) { + $level = 3; + } + my $obj = { logfile => $logfile, + level => $level }; return bless $obj, $pkg; } @@ -65,6 +69,14 @@ return 1; } +sub msg{ + my ( $self, $level, $message ) = @_; + if ( $level >= $self->{ 'level' }){ + $self->log($message); + } +} + + =head1 FUNCTION dump_err Log an error, print to STDERR Modified: trunk/Test-Sut/scripts/admin/brt_egate.pl =================================================================== --- trunk/Test-Sut/scripts/admin/brt_egate.pl 2006-07-19 21:27:29 UTC (rev 313) +++ trunk/Test-Sut/scripts/admin/brt_egate.pl 2006-07-20 17:54:59 UTC (rev 314) @@ -35,7 +35,7 @@ use strict; use Test::Admin::Result; -my $result = new Test::Admin::Result( '/etc/brt/brt_default.cfg' ); +my $result = new Test::Admin::Result( '/etc/stp/stp_main.conf' ); $result->read_email(); if ( $result->decrypt() ){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-19 21:27:31
|
Revision: 313 Author: judith_osdl Date: 2006-07-19 14:27:29 -0700 (Wed, 19 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=313&view=rev Log Message: ----------- Check for yes or auto send_results options. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-19 21:18:05 UTC (rev 312) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-19 21:27:29 UTC (rev 313) @@ -57,7 +57,7 @@ } my $send_flag = $self->getConfigParam( "email_results" ); - if ( $send_flag =~ m/yes/i ){ + if ( $send_flag =~ m/yes|auto/i ){ $self->send_results(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-19 21:18:08
|
Revision: 312 Author: judith_osdl Date: 2006-07-19 14:18:05 -0700 (Wed, 19 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=312&view=rev Log Message: ----------- Move create syslog log file before copies. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-18 21:15:32 UTC (rev 311) +++ trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-19 21:18:05 UTC (rev 312) @@ -64,6 +64,11 @@ syslog "uploading results to the server"; + require Sys::SyslogMessages; + my $syslog = new Sys::SyslogMessages(); + $syslog->tail({'number_hours' => '6', 'output_file' => './logs/syslog.txt'}); + system "chmod 644 ./logs/syslog.txt"; + # Move the test results to the current directory & archive them chdir( "$ENV{'EXEC_HOME'}" ); # Set new RESULTS_TOP @@ -92,11 +97,6 @@ system "mv -f $test_name/*.html $ENV{'RESULTS_TOP'}"; system "mv -f $test_name/result_email.txt $ENV{'RESULTS_TOP'}"; - require Sys::SyslogMessages; - my $syslog = new Sys::SyslogMessages(); - $syslog->tail({'number_hours' => '6', 'output_file' => './logs/syslog.txt'}); - system "chmod 644 ./logs/syslog.txt"; - # Go to the final location of the results $ENV{'RESULTS_TOP'}= "$ENV{ 'EXEC_HOME' }/$ENV{'TEST_ID'}"; chdir( $ENV{'RESULTS_TOP'} ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-18 21:15:35
|
Revision: 311 Author: judith_osdl Date: 2006-07-18 14:15:32 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=311&view=rev Log Message: ----------- Fix the Exports list. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-14 17:59:30 UTC (rev 310) +++ trunk/Test-Sut/lib/Test/Sut/Upload/EmailW.pm 2006-07-18 21:15:32 UTC (rev 311) @@ -25,9 +25,9 @@ use Exporter; our @ISA = qw( Test::Sut::Upload Exporter); our @EXPORT = qw( upload_all - upload_result upload_results - upload_file + encrypt_results + send_results request_details request_details_file ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-14 17:59:48
|
Revision: 310 Author: judith_osdl Date: 2006-07-14 10:59:30 -0700 (Fri, 14 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=310&view=rev Log Message: ----------- Fix the email_resuls include. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut.pm Modified: trunk/Test-Sut/lib/Test/Sut.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut.pm 2006-07-14 17:43:18 UTC (rev 309) +++ trunk/Test-Sut/lib/Test/Sut.pm 2006-07-14 17:59:30 UTC (rev 310) @@ -107,6 +107,7 @@ $self->{ 'stp_client_log' } = $self->getConfigParam( "stp_client_log" ); $self->{ 'state_file' } = $self->getConfigParam( "state_file" ); $self->{ 'rpc' } = ''; + $self->{ 'email_results' } = $self->getConfigParam( "email_results" ); # Check the attributes unless ( defined $self->{ 'exec_home' } ) @@ -185,9 +186,9 @@ # This does no installation require Test::Sut::Kernel::Dummy; Test::Sut::Dummy->import; } - if ( $self->getConfigParam( "email_results" =~ m/yes/ ) ){ + if ( $self->{ "email_results" } =~ m/yes/ ){ require Test::Sut::Upload::Email; Test::Sut::Upload::Email->import; - } elsif ( $self->getConfigParam( "email_results" =~ m/auto/ ) ){ + } elsif ( $self->{ "email_results" } =~ m/auto/ ){ require Test::Sut::Upload::EmailW; Test::Sut::Upload::EmailW->import; } elsif ( $self->{ 'lite' } eq 'yes' ) { require Test::Sut::Upload; Test::Sut::Upload->import; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-07-14 17:43:21
|
Revision: 309 Author: judith_osdl Date: 2006-07-14 10:43:18 -0700 (Fri, 14 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=309&view=rev Log Message: ----------- Fix reference Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-13 22:24:25 UTC (rev 308) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-14 17:43:18 UTC (rev 309) @@ -163,7 +163,7 @@ $self->mail_admin( " File Upload Failure ($file)", "STP Test failed to upload results file \"$file\".\n" - . $r->request_details() + . $self->request_details() ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
70 messages has been excluded from this view by a project administrator.
